Skip to content

Commit

Permalink
haskell-process-start: restore haskell-process-load-or-reload-prompt …
Browse files Browse the repository at this point in the history
…powe
  • Loading branch information
deepfire committed Aug 5, 2015
1 parent 76ff778 commit ce93386
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions haskell-commands.el
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ You can create new session using function `haskell-session-make'."
(haskell-process-set (haskell-session-process session) 'is-restarting nil)
(let ((default-directory (haskell-session-cabal-dir session))
(log-and-command (haskell-process-compute-process-log-and-command session (haskell-process-type))))
(haskell-session-prompt-set-current-dir session)
(haskell-session-prompt-set-current-dir session (not haskell-process-load-or-reload-prompt))
(haskell-process-set-process
process
(progn
Expand Down Expand Up @@ -535,15 +535,15 @@ of which the latter defaults to the current buffer."
(file-name-directory (buffer-file-name buffer))
"~/")))

(defun haskell-session-prompt-set-current-dir (session)
(defun haskell-session-prompt-set-current-dir (session &optional use-default)
"Prompt for the current directory.
Return current working directory for SESSION.
Optional CHANGE argument makes user to choose new working directory for SESSION.
In this case new working directory path will be returned."
(haskell-session-set-current-dir
session
(haskell-utils-read-directory-name "Set current directory: "
(haskell-session-buffer-default-dir session)))
Return current working directory for SESSION."
(let ((default (haskell-session-buffer-default-dir session)))
(haskell-session-set-current-dir
session
(if use-default
default
(haskell-utils-read-directory-name "Set current directory: " default))))
(haskell-session-get session 'current-dir))

(defun haskell-process-change-dir (session process dir)
Expand Down

0 comments on commit ce93386

Please sign in to comment.