aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2014-10-20 23:18:13 +0400
committerAlex Kost <alezost@gmail.com>2014-10-27 21:52:55 +0300
commitce2e4e393849499ecf4c51c78b41a6eed9ff8656 (patch)
treeec9958d53b6c8a24e2578bc9c069cfa8fff9d455
parentd2b299a91f3be283df1264afe62770ab2783ace9 (diff)
downloadpatches-ce2e4e393849499ecf4c51c78b41a6eed9ff8656.tar
patches-ce2e4e393849499ecf4c51c78b41a6eed9ff8656.tar.gz
emacs: Introduce REPL operation type.
* emacs/guix-backend.el (guix-repl-operation-type): New variable. (guix-repl-output-filter): Run type hooks after performing an operation. (guix-eval-read): Add 'operation-type' argument.
-rw-r--r--emacs/guix-backend.el26
1 files changed, 23 insertions, 3 deletions
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index d37d9d4b67..93d0ed1c96 100644
--- a/emacs/guix-backend.el
+++ b/emacs/guix-backend.el
@@ -133,6 +133,12 @@ This REPL is used for receiving information only if
This internal variable is used to distinguish Guix operations
from operations performed in Guix REPL by a user.")
+(defvar guix-repl-operation-type nil
+ "Type of the current operation performed by `guix-eval-in-repl'.
+This internal variable is used to define what actions should be
+executed after the current operation succeeds.
+See `guix-eval-in-repl' for details.")
+
(defun guix-repl-operation-success-message ()
"Message telling about successful Guix operation."
(message "Guix operation has been performed."))
@@ -232,7 +238,16 @@ This is a replacement for `geiser-repl--output-filter'."
(geiser-autodoc--disinhibit-autodoc)
(when guix-repl-operation-p
(setq guix-repl-operation-p nil)
- (run-hooks 'guix-after-repl-operation-hook)))
+ (run-hooks 'guix-after-repl-operation-hook)
+ ;; Run hooks specific to the current operation type.
+ (when guix-repl-operation-type
+ (let ((type-hook (intern
+ (concat "guix-after-"
+ (symbol-name guix-repl-operation-type)
+ "-hook"))))
+ (setq guix-repl-operation-type nil)
+ (and (boundp type-hook)
+ (run-hooks type-hook))))))
((string-match geiser-guile--debugger-prompt-regexp str)
(setq guix-repl-operation-p nil)
(geiser-con--connection-set-debugging geiser-repl--connection
@@ -317,12 +332,17 @@ Return elisp expression of the first result value of evaluation."
(replace-regexp-in-string
"#t" "t" (car (guix-eval str wrap))))))
-(defun guix-eval-in-repl (str &optional operation-buffer)
+(defun guix-eval-in-repl (str &optional operation-buffer operation-type)
"Switch to Guix REPL and evaluate STR with guile expression there.
If OPERATION-BUFFER is non-nil, it should be a buffer from which
-the current operation was performed."
+the current operation was performed.
+
+If OPERATION-TYPE is non-nil, it should be a symbol. After
+successful executing of the current operation,
+`guix-after-OPERATION-TYPE-hook' is called."
(run-hooks 'guix-before-repl-operation-hook)
(setq guix-repl-operation-p t
+ guix-repl-operation-type operation-type
guix-operation-buffer operation-buffer)
(let ((repl (guix-get-repl-buffer)))
(with-current-buffer repl