CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Heikki Johannes Junes <[EMAIL PROTECTED]> 05/10/14
12:35:25
Modified files:
. : ChangeLog THANKS
elisp : lilypond-font-lock.el lilypond-indent.el
Log message:
* elisp/lilypond-font-lock.el, elisp/lilypond-indent.el: Avoid nil
as an argument for char-syntax: use (char-syntax (or nil 0))
instead of (char-syntax nil), thanks to Milan Zamazal.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4174&tr2=1.4175&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.155&tr2=1.156&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/elisp/lilypond-font-lock.el.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/elisp/lilypond-indent.el.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4174 lilypond/ChangeLog:1.4175
--- lilypond/ChangeLog:1.4174 Thu Oct 13 23:25:13 2005
+++ lilypond/ChangeLog Fri Oct 14 12:35:23 2005
@@ -1,3 +1,9 @@
+2005-10-14 Heikki Junes <[EMAIL PROTECTED]>
+
+ * elisp/lilypond-font-lock.el, elisp/lilypond-indent.el: Avoid nil
+ as an argument for char-syntax: use (char-syntax (or nil 0))
+ instead of (char-syntax nil), thanks to Milan Zamazal.
+
2005-10-14 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* make/lilypond.fedora.spec.in (Group): add lilypond-internals to
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.155 lilypond/THANKS:1.156
--- lilypond/THANKS:1.155 Mon Oct 10 22:38:11 2005
+++ lilypond/THANKS Fri Oct 14 12:35:24 2005
@@ -28,6 +28,7 @@
D. Josiah Boothby
Kieren MacMillan
Kris Shaffer
+Milan Zamazal
Nancho Alvarez
Nicolas Sceaux
Steve Doonan
Index: lilypond/elisp/lilypond-font-lock.el
diff -u lilypond/elisp/lilypond-font-lock.el:1.3
lilypond/elisp/lilypond-font-lock.el:1.4
--- lilypond/elisp/lilypond-font-lock.el:1.3 Thu May 6 23:12:19 2004
+++ lilypond/elisp/lilypond-font-lock.el Fri Oct 14 12:35:25 2005
@@ -180,8 +180,8 @@
(setq context (parse-partial-sexp (point-min) (point)))
(cond ((nth 3 context)) ; inside string
((nth 4 context)) ; inside a comment
- ((eq (char-syntax (char-before (point))) ?\\)) ; found escape-char
- ((and (eq (char-syntax (char-before (- (point) 1))) ?\\)
+ ((eq (char-syntax (or (char-before (point)) 0)) ?\\)) ; found
escape-char
+ ((and (eq (char-syntax (or (char-before (- (point) 1)) 0)) ?\\)
(memq (char-before (point)) '( ?\) ?\] )))) ; found escape-char
((memq (char-before (point)) '( ?\) ))
(LilyPond-mode-set-syntax-table '( ?\( ?\) )))
Index: lilypond/elisp/lilypond-indent.el
diff -u lilypond/elisp/lilypond-indent.el:1.3
lilypond/elisp/lilypond-indent.el:1.4
--- lilypond/elisp/lilypond-indent.el:1.3 Sat Nov 6 22:06:01 2004
+++ lilypond/elisp/lilypond-indent.el Fri Oct 14 12:35:25 2005
@@ -383,7 +383,7 @@
;; match concurrent one-char opening and closing slurs
(if (and (eq dir 1)
(not (sequencep bracket-type))
- (eq (char-syntax (char-after oldpos)) ?\()
+ (eq (char-syntax (or (char-after oldpos) 0)) ?\()
(not (eq (char-after oldpos) ?<)))
;; anyway do not count open slur, since already level = -1
(progn (forward-char 1)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
