diff options
| author | Chong Yidong | 2009-10-24 21:15:39 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-10-24 21:15:39 +0000 |
| commit | 3e8ae8a6346e5c58d56dc99f632baaf02e255b7a (patch) | |
| tree | b724f883617a5120aa879456ded62c05603226b0 | |
| parent | ab276820088305a2e3b94f8f62d42f9c043c5c66 (diff) | |
| download | emacs-3e8ae8a6346e5c58d56dc99f632baaf02e255b7a.tar.gz emacs-3e8ae8a6346e5c58d56dc99f632baaf02e255b7a.zip | |
* progmodes/sh-script.el (sh-font-lock-paren): Handle case
patterns that are preceded by an open-paren (Bug#1320).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5387cfd080e..96db1cd6075 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-24 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-font-lock-paren): Handle case | ||
| 4 | patterns that are preceded by an open-paren (Bug#1320). | ||
| 5 | |||
| 1 | 2009-10-24 Sven Joachim <svenjoac@gmx.de> | 6 | 2009-10-24 Sven Joachim <svenjoac@gmx.de> |
| 2 | 7 | ||
| 3 | * files.el (delete-directory): Delete symlinks to directories with | 8 | * files.el (delete-directory): Delete symlinks to directories with |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 47eec4ee13f..ef37b3bfa0d 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -1109,6 +1109,9 @@ subshells can nest." | |||
| 1109 | (when (memq (char-before) '(?\" ?\')) | 1109 | (when (memq (char-before) '(?\" ?\')) |
| 1110 | (condition-case nil (progn (backward-sexp 1) t) | 1110 | (condition-case nil (progn (backward-sexp 1) t) |
| 1111 | (error nil))))) | 1111 | (error nil))))) |
| 1112 | ;; Patterns can be preceded by an open-paren (Bug#1320). | ||
| 1113 | (if (= (char-before (point)) ?\() | ||
| 1114 | (backward-char 1)) | ||
| 1112 | (while (progn | 1115 | (while (progn |
| 1113 | (forward-comment (- (point-max))) | 1116 | (forward-comment (- (point-max))) |
| 1114 | ;; Maybe we've bumped into an escaped newline. | 1117 | ;; Maybe we've bumped into an escaped newline. |