*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index af1e2d85872d2a6e57851f49b7a225df2800b655..5342d9bcd0f7d40d6a3fe95ecea7df04adc79232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
 
 2005-06-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/editor.scm (editor-command-template-alist): Start emacs if
+       emaclient fails.
+
        * lily/main.cc (setup_localisation): Listen to LILYPOND_LOCALEDIR.
 
        * flower/file-path.cc (is_file, is_dir): Export.

diff --git a/scm/editor.scm b/scm/editor.scm
index 46494c2912943d5bfb832fdb83f79bc106a52240..1d17b61d4bee555d64b3035b44f9735e99e8756f 100644 (file)
--- a/scm/editor.scm
+++ b/scm/editor.scm
@@ -30,7 +30,7 @@
         "emacs"))))
 
 (define editor-command-template-alist
-  '(("emacs" .  "emacsclient --no-wait +%(line)s:%(column)s %(file)s")
+  '(("emacs" .  "emacsclient --no-wait +%(line)s:%(column)s %(file)s || (emacs +%(line)s:%(column)s %(file)s&)")
     ("gvim" . "gvim --remote +:%(line)s:norm%(column)s %(file)s")
     ("uedit32" . "uedit32 %(file)s -l%(line)s -c%(column)s")
     ("nedit" . "nc -noask +%(line)s %(file)s")