20/20: emacs: Use popup interface instead 'guix-pull' command.

[Alex Kost]

alezost pushed a commit to branch wip-emacs-popup-ui
in repository guix.

commit 239298439dc17e69703e3aab64fe142896bd576d
Author: Alex Kost <address@hidden>
Date:   Tue Aug 18 11:32:42 2015 +0300

    emacs: Use popup interface instead 'guix-pull' command.
    
    * emacs/guix-base.el (guix-pull): Remove.
    * doc/emacs.texi (Emacs Commands): Adjust accordingly.
    * emacs/guix-main.scm: Do not use (guix scripts pull) module.
---
 doc/emacs.texi      |   12 ------------
 emacs/guix-base.el  |   16 +++-------------
 emacs/guix-main.scm |    1 -
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/doc/emacs.texi b/doc/emacs.texi
index e57cd1c..2099e6b 100644
--- a/doc/emacs.texi
+++ b/doc/emacs.texi
@@ -186,17 +186,6 @@ date/time prompt,,, org, The Org Manual}).
 
 @end table
 
-You can also invoke the @command{guix pull} command (@pxref{Invoking
-guix pull}) from Emacs using:
-
address@hidden @kbd
address@hidden M-x guix-pull
-With @kbd{C-u}, make it verbose.
address@hidden table
-
-Once @command{guix pull} has succeeded, the Guix REPL is restared.  This
-allows you to keep using the Emacs interface with the updated Guix.
-
 @node Emacs General info
 @subsection General information
 
@@ -350,7 +339,6 @@ emacs, The GNU Emacs Manual}) which can be used to:
 It is also possible to copy a button label (a link to an URL or a file)
 by pressing @kbd{c} on a button.
 
-
 @node Emacs Configuration
 @subsection Configuration
 
diff --git a/emacs/guix-base.el b/emacs/guix-base.el
index aa099b4..7e13787 100644
--- a/emacs/guix-base.el
+++ b/emacs/guix-base.el
@@ -1146,16 +1146,16 @@ The function is called with a single argument - a 
command line string."
 ;;; Pull
 
 (defcustom guix-update-after-pull t
-  "If non-nil, update Guix buffers after performing \\[guix-pull]."
+  "If non-nil, update Guix buffers after '\\[guix] pull'."
   :type 'boolean
   :group 'guix)
 
 (defvar guix-after-pull-hook
   '(guix-restart-repl-after-pull guix-update-buffers-maybe-after-pull)
-  "Hook run after successful performing `guix-pull' operation.")
+  "Hook run after successful performing 'guix pull' operation.")
 
 (defun guix-restart-repl-after-pull ()
-  "Restart Guix REPL after `guix-pull' operation."
+  "Restart Guix REPL after 'guix pull' operation."
   (guix-repl-exit)
   (guix-start-process-maybe
    "Restarting Guix REPL after pull operation ..."))
@@ -1171,16 +1171,6 @@ The function is called with a single argument - a 
command line string."
                           guix-output-info-mode)))
     (message "Guix buffers have been updated.")))
 
-;;;###autoload
-(defun guix-pull (&optional verbose)
-  "Run Guix pull operation.
-If VERBOSE is non-nil (with prefix argument), produce verbose output."
-  (interactive)
-  (let ((args (and verbose '("--verbose"))))
-    (guix-eval-in-repl
-     (apply #'guix-make-guile-expression 'guix-pull args)
-     nil 'pull)))
-
 (provide 'guix-base)
 
 ;;; guix-base.el ends here
diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index 692a06e..6371c5e 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -59,7 +59,6 @@
  (guix ui)
  (guix scripts lint)
  (guix scripts package)
- (guix scripts pull)
  (gnu packages))
 
 (define-syntax-rule (first-or-false lst)