aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-11-22 14:37:45 +0300
committerAlex Kost <alezost@gmail.com>2016-01-02 17:25:35 +0300
commit87fe9ecae5bc3ae0681a47e0ec6e6929d910664b (patch)
treeb4bc6580cd284ab1cd9728e200abc596a5963b77 /emacs
parent819518d15a4ca6ef4ce0844d89e990ffd46ee3a0 (diff)
downloadguix-87fe9ecae5bc3ae0681a47e0ec6e6929d910664b.tar
guix-87fe9ecae5bc3ae0681a47e0ec6e6929d910664b.tar.gz
emacs: Generalize buffer reverting.
This is a partial revert of commit d2b299a91f3be283df1264afe62770ab2783ace9. * emacs/guix-base.el (guix-revert-buffer): Make it more general by removing the code specific to a particular search (a search for packages/outputs by ID). Rename to... (guix-buffer-revert): ... this.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-base.el30
1 files changed, 6 insertions, 24 deletions
diff --git a/emacs/guix-base.el b/emacs/guix-base.el
index 7592988fec..9b90942d09 100644
--- a/emacs/guix-base.el
+++ b/emacs/guix-base.el
@@ -235,7 +235,7 @@ If MODES is nil, return list of all Guix 'list' and 'info' buffers."
(defun guix-update-buffer (buffer)
"Update information in a 'list' or 'info' BUFFER."
(with-current-buffer buffer
- (guix-revert-buffer nil t)))
+ (guix-buffer-revert nil t)))
(defun guix-update-buffers-maybe-after-operation ()
"Update buffers after Guix operation if needed.
@@ -447,7 +447,7 @@ If non-nil, ask to confirm for reverting `%S' buffer."
,(concat "Major mode for displaying information about "
entry-str ".\n\n"
"\\{" mode-map-str "}")
- (setq-local revert-buffer-function 'guix-revert-buffer)
+ (setq-local revert-buffer-function 'guix-buffer-revert)
(setq-local guix-history-size
(guix-buffer-history-size
',buffer-type ',entry-type))
@@ -582,7 +582,7 @@ If NO-DISPLAY is non-nil, do not switch to the buffer."
buffer-type)
entry-type)))))
-(defun guix-revert-buffer (_ignore-auto noconfirm)
+(defun guix-buffer-revert (_ignore-auto noconfirm)
"Update information in the current buffer.
The function is suitable for `revert-buffer-function'.
See `revert-buffer' for the meaning of NOCONFIRM."
@@ -590,31 +590,13 @@ See `revert-buffer' for the meaning of NOCONFIRM."
(guix-buffer-revert-confirm? guix-buffer-type
guix-entry-type)
(y-or-n-p "Update current information? "))
- (let* ((search-type guix-search-type)
- (search-vals guix-search-vals)
- (params (guix-get-params-for-receiving guix-buffer-type
+ (let* ((params (guix-get-params-for-receiving guix-buffer-type
guix-entry-type))
(entries (guix-get-entries
guix-profile guix-entry-type
- guix-search-type guix-search-vals params))
- ;; If a REPL was restarted, package/output IDs are not actual
- ;; anymore, because 'object-address'-es died with the REPL, so if a
- ;; search by ID didn't give results, search again by name.
- (entries (if (and (null entries)
- (eq guix-search-type 'id)
- (or (eq guix-entry-type 'package)
- (eq guix-entry-type 'output)))
- (progn
- (setq search-type 'name
- search-vals
- (guix-package-entries->name-specifications
- guix-entries))
- (guix-get-entries
- guix-profile guix-entry-type
- search-type search-vals params))
- entries)))
+ guix-search-type guix-search-vals params)))
(guix-set-buffer guix-profile entries guix-buffer-type guix-entry-type
- search-type search-vals t t))))
+ guix-search-type guix-search-vals t t))))
(defvar guix-buffer-after-redisplay-hook nil
"Hook run by `guix-buffer-redisplay'.