Re: Lilypond and Emacs mode for Emacs 22

[Nicolas Sceaux]

Heikki Johannes Junes <address@hidden> writes:

> On Tue, 11 Oct 2005 21:42:37 +0200 Jan Buchal <address@hidden> wrote:
>
>> Hello,
>> 
>> we develop Free Software for blind and we have several blind users
>> who use Emacs Lilypond mode. 
>
> This is a good thing.
>
>> Now we have problem with Lilypond mode
>> and CVS Emacs. In Emacs 22.xx are changed some functions so that the
>> Lilypond mode not works. Do you have some new version for new Emacs?
>> 
>> Thanks.
>>
>> Jan Buchal
>
> Seems like 21.4 is the current stable release, and I have not used CVS Emacs.
> Therefore, patches for LilyPond's Emacs files are welcome. The type of changes
> needed becomes evident from the error messages which appear during loading of
> the LilyPond mode in Emacs. One should also make sure that the functionality
> which works now with the current stable 21.4 (and probably with some earlier
> versions ?) will not break.

Using in Emacs 22.0.50.1, I applied the following patch.

Index: lilypond-mode.el
===================================================================
RCS file: /cvsroot/lilypond/lilypond/elisp/lilypond-mode.el,v
retrieving revision 1.18
diff -u -r1.18 lilypond-mode.el
--- lilypond-mode.el    12 Jun 2005 18:44:29 -0000      1.18
+++ lilypond-mode.el    12 Oct 2005 18:33:34 -0000
@@ -393,11 +393,11 @@
   (let ((fnameprefix (if (eq LilyPond-command-current 'LilyPond-command-master)
                         (substring (LilyPond-get-master-file) 0 -3); suppose 
".ly"
                       LilyPond-region-file-prefix))
-       (allcount (string-to-number (substring (count-midi-words) 0 -12)))
-       (count (string-to-number (substring (count-midi-words-backwards) 0 
-12))))
+       (allcount (count-midi-words))
+       (count (count-midi-words-backwards)))
     (concat  fnameprefix
             (if (and (> allcount 1) (> count 0)) ; not first score
-                (if (eq count allcount)          ; last score
+                (if (= count allcount)          ; last score
                     (concat "-" (number-to-string (+ count -1)))
                   (concat "-" (number-to-string count))))
             ".midi")))
@@ -407,7 +407,7 @@
   (let ((fnameprefix (if (eq LilyPond-command-current 'LilyPond-command-master)
                         (substring (LilyPond-get-master-file) 0 -3); suppose 
".ly"
                       LilyPond-region-file-prefix))
-       (allcount (string-to-number (substring (count-midi-words) 0 -12))))
+       (allcount (count-midi-words)))
     (concat (if (> allcount 0)  ; at least one midi-score
                (concat fnameprefix ".midi "))
            (if (> allcount 1)  ; more than one midi-score