Skip to content

Cleanup following #449 #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 24, 2015
Merged

Cleanup following #449 #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459964b
Use haskell-compat, which already provides process-live-p
Fanael Jan 24, 2015
4a7fb9a
If + progn => when in the Makefile
Fanael Jan 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
13 changes: 1 addition & 12 deletions haskell-process.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
(require 'cl-lib)
(require 'json)
(require 'url-util)
(require 'haskell-compat)
(require 'haskell-session)
(require 'haskell-customize)
(require 'haskell-str)
Expand Down Expand Up @@ -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."
Expand Down