Merge pull request #452 from Fanael/master

Cleanup following #449

Author: purcell

Makefile

@@ -3,9 +3,9 @@ GIT_VERSION = $(shell git describe --tags --match 'v[0-9]*' --long --dirty | sed
 
 INSTALL_INFO = install-info
 EMACS = emacs
-EFLAGS = --eval "(if (< emacs-major-version 24)                                    \
-                      (progn (add-to-list 'load-path (expand-file-name \"tests/compat\"))  \
-                             (setq byte-compile-warnings '(not cl-functions))))"       \
+EFLAGS = --eval "(when (< emacs-major-version 24) \
+                    (add-to-list 'load-path (expand-file-name \"tests/compat\")) \
+                    (setq byte-compile-warnings '(not cl-functions)))" \
          --eval '(setq byte-compile-error-on-warn t)'
 
 BATCH = $(EMACS) $(EFLAGS) --batch -Q -L .

haskell-process.el

@@ -26,6 +26,7 @@
 (require 'cl-lib)
 (require 'json)
 (require 'url-util)
+(require 'haskell-compat)
 (require 'haskell-session)
 (require 'haskell-customize)
 (require 'haskell-str)
@@ -217,18 +218,6 @@ the response."
           (haskell-process-send-string (car state)
                                        (cdr state))))))
 
-(eval-when-compile
-  ;; Emacs23 does not have process-live-p. That is easy to define.
-  (unless (fboundp 'process-live-p)
-    (defun process-live-p (process)
-      "Returns non-nil if PROCESS is alive.
-A process is considered alive if its status is `run', `open',
-`listen', `connect' or `stop'.  Value is nil if PROCESS is not a
-process."
-      (and (processp process)
-	   (memq (process-status process)
-		 '(run open listen connect stop))))))
-
 
 (defun haskell-process-queue-command (process command)
   "Add a command to the process command queue."