* 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.

diff --git a/ChangeLog b/ChangeLog
index bbc194942660be49495b5956c1001f8790a450df..6e9165c34722842a0e7b9a9aa31599fe481c13fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-14  Heikki Junes <hjunes@cc.hut.fi>
+
+       * 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  <hanwen@xs4all.nl>
 
        * make/lilypond.fedora.spec.in (Group): add lilypond-internals to

diff --git a/THANKS b/THANKS
index a0b8a290a08a46d1cdf58219d0ae540113ba48e2..48c6573909e7e041c02014b15671542fde7f4642 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ Jamie Bullock
 D. Josiah Boothby
 Kieren MacMillan
 Kris Shaffer
+Milan Zamazal
 Nancho Alvarez
 Nicolas Sceaux
 Steve Doonan

diff --git a/elisp/lilypond-font-lock.el b/elisp/lilypond-font-lock.el
index 9e71ad6f0297264bfc4e6413477909f1ae540dd7..224ab779de2f48ca0e24ad61e3ff2e7d897bbd53 100644 (file)
--- a/elisp/lilypond-font-lock.el
+++ b/elisp/lilypond-font-lock.el
@@ -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 '( ?\( ?\) )))

diff --git a/elisp/lilypond-indent.el b/elisp/lilypond-indent.el
index fd9ce60dabd955a485145082906c386a426161fb..de988f9ff5acfc9a66505d2ee4a6a9dce9b4aef4 100644 (file)
--- a/elisp/lilypond-indent.el
+++ b/elisp/lilypond-indent.el
@@ -383,7 +383,7 @@ slur-paren-p defaults to nil.
     ;; 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)