ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

edit: Honor $VISUAL.

Browse source 
Suggested by Andreas Enge <andreas@enge.fr>.

* guix/scripts/edit.scm (%editor): Honor 'VISUAL' before 'EDITOR'.
  (show-help): Adjust accordingly.
* doc/guix.texi (Invoking guix edit): Likewise.
This commit is contained in:
Ludovic Courtès 2015-11-11 22:59:35 +01:00
parent 6d2e833495
commit 6237b9fa39
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/guix.texi
View file

@ -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''

5
guix/scripts/edit.scm
View file

@ -38,7 +38,7 @@ (define %options
(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 @@ (define (show-help)
(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."