diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
| commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
| tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /guix/scripts/edit.scm | |
| parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
| parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
| download | gnu-guix-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar gnu-guix-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'guix/scripts/edit.scm')
| -rw-r--r-- | guix/scripts/edit.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm index a6fd1d2751..43f3011869 100644 --- a/guix/scripts/edit.scm +++ b/guix/scripts/edit.scm @@ -56,10 +56,9 @@ Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n")) (show-bug-report-information)) (define %editor - ;; 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"))) + ;; Nano is sensible default, as it is installed by base system. + ;; For development, user can set custom value for $EDITOR. + (make-parameter (or (getenv "VISUAL") (getenv "EDITOR") "nano"))) (define (search-path* path file) "Like 'search-path' but exit if FILE is not found." |