*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 3057ec3ce8089d3e4931afad92e01de31a060862..14eae8cc538a39b55ca3b7f40250ee7573d6f7ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-29  Milan Zamazal  <pdm@brailcom.org>
+
+       * elisp/lilypond-mode.el (LilyPond-command-alist): Don't try to
+       figure out midi file names right here.
+       
 2006-09-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/framework-ps.scm (dump-stencil-as-EPS): naming pad-eps-boxes.

diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el
index db3c8caf4ed77866eceb35ecb6181f8b362966cb..d27487c6edb8c9cb12086a511f7b5f38665946e3 100644 (file)
--- a/elisp/lilypond-mode.el
+++ b/elisp/lilypond-mode.el
@@ -446,9 +446,9 @@ in LilyPond-include-path."
 
     ;; The following are refreshed in LilyPond-command:
     ;; - current-midi depends on cursor position and
-    ("Midi" . (,(concat LilyPond-midi-command " " (LilyPond-string-current-midi)))) ; 
+    ("Midi" . ("")) ; 
     ;; - all-midi depends on number of midi-score.
-    ("MidiAll" . (,(concat LilyPond-all-midi-command " " (LilyPond-string-all-midi))))
+    ("MidiAll" . (""))
     )
 
   "AList of commands to execute on the current document.

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 787c27f25a2e18fa17fa0d28b58f10218010fbb8..fd69d379d5a4e42b0aec4af31493ea0dfc9d7e43 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -74,9 +74,7 @@ dir_name (string const file_name)
   if (n && s[n - 1] == '/')
     s[n - 1] = 0;
   if (s.rfind ('/') != NPOS)
-    {
-      s = s.substr (0, s.rfind ('/'));
-    }
+    s = s.substr (0, s.rfind ('/'));
   else
     s = "";