* Documentation/user/preface.itely (Preface): Run

texinfo-all-menus-update.

* scm/editor.scm (get-editor-command): Bugfix: allow full
LYEDITOR setting, partial XEDITOR setting.  With typo fix.

diff --git a/ChangeLog b/ChangeLog
index 3ae1e736fd7f9cff12a7cf742a1d413bedf29bf1..3219947beecce6988e9a0aa3c33b0403b916da2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2005-05-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * Documentation/user/preface.itely (Preface): Run
+       texinfo-all-menus-update.
+
        * scm/editor.scm (get-editor-command): Bugfix: allow full
-       LYEDITOR setting, partial XEDITOR setting.
+       LYEDITOR setting, partial XEDITOR setting.  With typo fix.
 
        * Documentation/pictures/lilypond-48.xpm: New file.
 

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index ac81016a40a883a3052ffb0caf4fbc862935667b..2965a376f4870c73282284dc3c55f1611b57542a 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -49,7 +49,7 @@ Han-Wen and Jan
 Utrecht/Eindhoven, The Netherlands, July 2002.
 
 @menu
-* Notes for version 2.4::       
+* Notes for version 2.6::       
 @end menu
 
 @node Notes for version 2.6

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