Merge remote-tracking branch 'origin/translation'

[lilypond.git] / elisp / lilypond-indent.el

diff --git a/elisp/lilypond-indent.el b/elisp/lilypond-indent.el
index 635aa62472b5aa968bd75be306e8be515c809ddb..bc04ed5a387dba3db8fb44c9d11f6aa3718db04c 100644 (file)
--- a/elisp/lilypond-indent.el
+++ b/elisp/lilypond-indent.el
@@ -14,7 +14,7 @@
 ;;;    * currently, in bracket matching one may need a non-bracket
 ;;;      chararacter between the bracket characters, like ( ( ) )
 
-(defcustom LilyPond-indent-level 4
+(defcustom LilyPond-indent-level 2
   "*Indentation of lilypond statements with respect to containing block."
   :group 'LilyPond
   :type 'integer)
@@ -68,7 +68,7 @@ Compares with other text in same context."
   :group 'LilyPond
   :type 'boolean)
 
-(defcustom LilyPond-comment-region "%%$"
+(defcustom LilyPond-comment-region "%%%"
   "*String inserted by \\[LilyPond-comment-region]\
  at start of each line in region."
   :group 'LilyPond
@@ -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)