count one slur type in LilyPond-show-paren-function

diff --git a/ChangeLog b/ChangeLog
index c0603741bd1be138ee2cab814e28ee063a4e2ccb..58d37afdeb15c1fbce4740736400724ef5623a72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-07  Heikki Junes  <hjunes@cc.hut.fi>
+
+       * lilypond-indent.el: match only one type of slurs in
+       LilyPond-show-paren-function.
+
 2003-06-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * debian/GNUmakefile (EXTRA_DIST_FILES): 

diff --git a/lilypond-indent.el b/lilypond-indent.el
index a133ab9ef8d0517020c10a170f3b232dc78fbaf1..f98a8d9480cb784d6633211f244844860ab68786 100644 (file)
--- a/lilypond-indent.el
+++ b/lilypond-indent.el
@@ -337,6 +337,9 @@ slur-paren-p defaults to nil.
                 (setq paren-regexp (concat (car paren-regexp) "\\|" (cdr paren-regexp))))
        (setq paren-regexp (concat (mapconcat 'car (mapcar 'cdr regexp-alist) "\\|") "\\|"
                                   (mapconcat 'cdr (mapcar 'cdr regexp-alist) "\\|")))))
+    (if (and (eq dir 1)
+            (memq (char-after oldpos) '(?[ ?{)))
+       (forward-char 1))
     (while (and (if (/= dir 1) 
                    (> level 0) 
                  (< level 0))
@@ -430,7 +433,8 @@ builtin 'blink-matching-open' is not used. In syntax table, see
       (narrow-to-region
        (max (point-min) (- (point) blink-matching-paren-distance))
        (min (point-max) (+ (point) blink-matching-paren-distance))))
-    (if (memq bracket-type '(?> ?} ?< ?{))
+    (if (and (equal this-command 'LilyPond-electric-close-paren)
+            (memq bracket-type '(?> ?} ?< ?{)))
        ;; < { need to be mutually balanced and nested, so search backwards for both of these bracket types 
        (LilyPond-scan-containing-sexp nil nil dir)  
       ;; whereas ( ) slurs within music don't, so only need to search for ( )