From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 3 Jun 2005 22:26:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.28~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=b522645c959378a192ad935318f0a1dbb65ac788;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index af1e2d8587..5342d9bcd0 100644
--- 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 46494c2912..1d17b61d4b 100644
--- 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")