Skip to content

Change a couple hook properties #1201

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 1 commit into from
Mar 10, 2016
Merged

Change a couple hook properties #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion haskell-customize.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ when showing type information about symbols."
:type 'boolean
:safe 'booleanp)

(defvar haskell-process-end-hook nil
(defvar haskell-process-ended-functions (list 'haskell-process-prompt-restart)
"Hook for when the haskell process ends.")

;;;###autoload
Expand Down
6 changes: 3 additions & 3 deletions haskell-interactive-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ Key bindings:
(setq haskell-interactive-mode-history (list))
(setq haskell-interactive-mode-history-index 0)

(setq next-error-function 'haskell-interactive-next-error-function)
(setq next-error-function #'haskell-interactive-next-error-function)
(add-hook 'completion-at-point-functions
'haskell-interactive-mode-completion-at-point-function nil t)

#'haskell-interactive-mode-completion-at-point-function nil t)
(add-hook 'kill-buffer-hook #'haskell-interactive-kill nil t)
(haskell-interactive-mode-prompt))

(defvar haskell-interactive-mode-prompt-start
Expand Down
6 changes: 3 additions & 3 deletions haskell-process.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function."
(haskell-process-log
(propertize "Process reset.\n"
'face font-lock-comment-face))
(run-hook-with-args 'haskell-process-ended-hook process))))))
(run-hook-with-args 'haskell-process-ended-functions process))))))

(defun haskell-process-filter (proc response)
"The filter for the process pipe."
Expand Down Expand Up @@ -233,7 +233,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function."
'face '((:weight bold))))
(process-send-string child out))
(unless (haskell-process-restarting process)
(run-hook-with-args 'haskell-process-ended process)))))
(run-hook-with-args 'haskell-process-ended-functions process)))))

(defun haskell-process-live-updates (process)
"Process live updates."
Expand Down Expand Up @@ -271,7 +271,7 @@ the response."
(haskell-command-exec-go cmd))))
(progn (haskell-process-reset process)
(haskell-process-set process 'command-queue nil)
(run-hook-with-args 'haskell-process-ended process))))
(run-hook-with-args 'haskell-process-ended-functions process))))

(defun haskell-process-queue-flushed-p (process)
"Return t if command queue has been completely processed."
Expand Down
6 changes: 0 additions & 6 deletions haskell.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
(require 'haskell-utils)
(require 'haskell-customize)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Basic configuration hooks

(add-hook 'haskell-process-ended-hook 'haskell-process-prompt-restart)
(add-hook 'kill-buffer-hook 'haskell-interactive-kill)

(defvar interactive-haskell-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c C-l") 'haskell-process-load-file)
Expand Down