~ruther/guix-local: edit: Allow command line arguments in $VISUAL and $EDITOR.

b16dbd1311c9bd1346dcf0d490f25455e12b04cf — Mathieu Lirzin 10 years ago 2f52ad7

edit: Allow command line arguments in $VISUAL and $EDITOR.

* guix/scripts/edit.scm (guix-edit): Fix the assumption that %editor is
a one word command.

patch browse .tar.gz

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

M guix/scripts/edit.scm

M guix/scripts/edit.scm => guix/scripts/edit.scm +6 -2

@@ 1,5 1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 83,8 84,11 @@ line."
 
       (catch 'system-error
         (lambda ()
-          (apply execlp (%editor) (%editor)
-                 (append-map package->location-specification packages)))
+          (let ((file-names (append-map package->location-specification
+                                        packages)))
+            ;; Use `system' instead of `exec' in order to sanely handle
+            ;; possible command line arguments in %EDITOR.
+            (exit (system (string-join (cons (%editor) file-names))))))
         (lambda args
           (let ((errno (system-error-errno args)))
             (leave (_ "failed to launch '~a': ~a~%")