[Emacs-diffs] emacs/lisp ChangeLog progmodes/sh-script.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/24 21:15:42

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : sh-script.el 

Log message:
        * progmodes/sh-script.el (sh-font-lock-paren): Handle case
        patterns that are preceded by an open-paren (Bug#1320).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16502&r2=1.16503
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/sh-script.el?cvsroot=emacs&r1=1.227&r2=1.228

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16502
retrieving revision 1.16503
diff -u -b -r1.16502 -r1.16503
--- ChangeLog   24 Oct 2009 20:30:44 -0000      1.16502
+++ ChangeLog   24 Oct 2009 21:15:39 -0000      1.16503
@@ -1,3 +1,8 @@
+2009-10-24  Chong Yidong  <address@hidden>
+
+       * progmodes/sh-script.el (sh-font-lock-paren): Handle case
+       patterns that are preceded by an open-paren (Bug#1320).
+
 2009-10-24  Sven Joachim  <address@hidden>
 
        * files.el (delete-directory): Delete symlinks to directories with

Index: progmodes/sh-script.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- progmodes/sh-script.el      2 Oct 2009 00:02:06 -0000       1.227
+++ progmodes/sh-script.el      24 Oct 2009 21:15:42 -0000      1.228
@@ -1109,6 +1109,9 @@
                  (when (memq (char-before) '(?\" ?\'))
                    (condition-case nil (progn (backward-sexp 1) t)
                      (error nil)))))
+         ;; Patterns can be preceded by an open-paren (Bug#1320).
+         (if (= (char-before (point)) ?\()
+             (backward-char 1))
           (while (progn
                    (forward-comment (- (point-max)))
                    ;; Maybe we've bumped into an escaped newline.