(get-editor-command): Bugfix: allow full

LYEDITOR setting, partial XEDITOR setting.

diff --git a/ChangeLog b/ChangeLog
index 5a44f07a142019ca3af5ddc6032a8cade2d36b36..3ae1e736fd7f9cff12a7cf742a1d413bedf29bf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/editor.scm (get-editor-command): Bugfix: allow full
+       LYEDITOR setting, partial XEDITOR setting.
+
        * Documentation/pictures/lilypond-48.xpm: New file.
 
        * flower/file-path.cc (to_string): Bugfix: use PATHSEP.

diff --git a/scm/editor.scm b/scm/editor.scm
index 962627941ad0978887b7f79cf107b66ada75c414..b57d7c2d5d161b922f284e834e802a47d99f6fa1 100644 (file)
--- a/scm/editor.scm
+++ b/scm/editor.scm
@@ -28,7 +28,9 @@
 (define-public (get-editor-command file-name line column)
   (define (get-command-template alist editor)
     (if (null? alist)
-       #f
+       (if (string-match "%\\(file\\)s" file-name)
+           (file-name)
+           (string-append file-name " %(file)s"))
        (if (string-match (caar alist) editor)
            (cdar alist)
            (get-command-template (cdr alist) editor))))