summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2015-11-21 15:05:07 +0100
committerMathieu Lirzin <mthl@gnu.org>2015-12-06 17:23:25 +0100
commitcd08fe4259f72815a4b096b2a5ce325e9b445da4 (patch)
tree9d9fccc48beac3d6f65ecf32cfab131e5dfaa67a
parentb16dbd1311c9bd1346dcf0d490f25455e12b04cf (diff)
downloadguix-cd08fe4259f72815a4b096b2a5ce325e9b445da4.tar.gz
edit: Don't assume that an emacs daemon is running.
* guix/scripts/edit.scm (%editor): Use Emacs as a default value.
-rw-r--r--guix/scripts/edit.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index 660bd57985..ce3ac4146d 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -49,8 +49,10 @@ Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
   (show-bug-report-information))
 
 (define %editor
-  (make-parameter (or (getenv "VISUAL") (getenv "EDITOR")
-                      "emacsclient")))
+  ;; XXX: It would be better to default to something more likely to be
+  ;; pre-installed on an average GNU system.  Since Nano is not suited for
+  ;; editing Scheme, Emacs is used instead.
+  (make-parameter (or (getenv "VISUAL") (getenv "EDITOR") "emacs")))
 
 (define (search-path* path file)
   "Like 'search-path' but exit if FILE is not found."