X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lilypond-indent.el;h=4e11faae60d050b74098481dec23e210a7de4d6e;hb=d64b93745ddfce23799c8388805e7b4e472ea3ef;hp=5427cc0dfb882369b06bd2515001cb7a56b5073b;hpb=34a25e157a46ea77e1933dcd47bf4ad12e09e7de;p=lilypond.git

diff --git a/lilypond-indent.el b/lilypond-indent.el
index 5427cc0dfb..4e11faae60 100644
--- a/lilypond-indent.el
+++ b/lilypond-indent.el
@@ -255,7 +255,7 @@ Argument LIM limit."
 ;; are handled by the syntax table
 
 (defconst LilyPond-parens-regexp-alist
-  `( ( ?>  .  ("[^\\]<" . "[^ \\n\\t_^-]\\s-*>\\|[_^-]\\s-*[-^]\\s-*>"))
+  `( ( ?>  .  ("\\([^\\]\\|^\\)<" . "[^ \\n\\t_^-]\\s-*>\\|[_^-]\\s-*[-^]\\s-*>"))
      ;; a b c->, a b c^> and a b c_> are not close-angle-brackets, they're accents
      ;; but a b c^-> and a b c^^> are close brackets with tenuto/marcato before them
      ;; also \> and \< are hairpins
@@ -331,7 +331,8 @@ slur-paren-p defaults to nil.
   (let ( (test-point (point))
 	 (level 0) )
     (save-excursion 
-      (if (or (and (= (char-after (point)) ?\()
+      (if (or (and (/= (point) (point-max))
+		   (= (char-after (point)) ?\()
 		   (or (= (char-after (- (point) 1)) ?#)
 		       (and (= (char-after (- (point) 2)) ?#)
 			    (= (char-after (- (point) 1)) ?`))))