Merge branch 'master' of github.com:kazu-yamamoto/ghc-mod

This commit is contained in:
Daniel Gröber 2015-08-12 08:52:25 +02:00
commit 6a01550d3f
2 changed files with 22 additions and 25 deletions

View File

@ -18,8 +18,7 @@
(defvar-local ghc-process-original-buffer nil)
(defvar-local ghc-process-original-file nil)
(defvar-local ghc-process-callback nil)
(defvar-local ghc-process-hook nil
"Hook that will be called upon successfull completion of ghc-mod command.")
(defvar-local ghc-process-hook nil)
(defvar ghc-command "ghc-mod")
@ -31,9 +30,7 @@
(defun ghc-with-process (cmd callback &optional hook1 hook2)
(unless ghc-process-process-name
(setq ghc-process-process-name (ghc-get-project-root)))
(if ghc-process-running
(error "ghc process already running")
(progn
(when (and ghc-process-process-name (not ghc-process-running))
(setq ghc-process-running t)
(if hook1 (funcall hook1))
(let* ((cbuf (current-buffer))
@ -52,7 +49,7 @@
(when ghc-debug
(ghc-with-debug-buffer
(insert (format "%% %s" cmd))))
pro))))))
pro)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;