2 files changed, 6 insertions(+), 4 deletions(-)

M doc/guix.texi
M guix/scripts/edit.scm

@@ 3929,8 3929,9 @@ guix edit gcc-4.8 vim
 @end example
 
 @noindent
-launches the program specified in the @code{EDITOR} environment variable
-to edit the recipe of GCC@tie{}4.8.4 and that of Vim.
+launches the program specified in the @code{VISUAL} or in the
+@code{EDITOR} environment variable to edit the recipe of GCC@tie{}4.8.4
+and that of Vim.
 
 If you are using Emacs, note that the Emacs user interface provides
 similar functionality in the ``package info'' and ``package list''

@@ 38,7 38,7 @@
 
 (define (show-help)
   (display (_ "Usage: guix edit PACKAGE...
-Start $EDITOR to edit the definitions of PACKAGE...\n"))
+Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
   (newline)
   (display (_ "
   -h, --help             display this help and exit"))


@@ 48,7 48,8 @@ Start $EDITOR to edit the definitions of PACKAGE...\n"))
   (show-bug-report-information))
 
 (define %editor
-  (make-parameter (or (getenv "EDITOR") "emacsclient")))
+  (make-parameter (or (getenv "VISUAL") (getenv "EDITOR")
+                      "emacsclient")))
 
 (define (search-path* path file)
   "Like 'search-path' but exit if FILE is not found."