aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-11-01 17:44:04 +0000
committerChong Yidong2009-11-01 17:44:04 +0000
commit6f750f0d8ef4536e6959e527bb1fb3c2eec6417d (patch)
tree09c601f47ada996a4024214b673e87fa885fe6a9
parent97ab3f47a69488b4c31a000b645db0620361dae0 (diff)
downloademacs-6f750f0d8ef4536e6959e527bb1fb3c2eec6417d.tar.gz
emacs-6f750f0d8ef4536e6959e527bb1fb3c2eec6417d.zip
* progmodes/sh-script.el (sh-font-lock-paren): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/sh-script.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index feab754d2a2..9c92b7b507a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-11-01 Chong Yidong <cyd@stupidchicken.com>
2
3 * progmodes/sh-script.el (sh-font-lock-paren): Fix last change.
4
12009-11-01 Andreas Schwab <schwab@linux-m68k.org> 52009-11-01 Andreas Schwab <schwab@linux-m68k.org>
2 6
3 * view.el (view-mode-exit): If OLD-BUF is dead bury the buffer 7 * view.el (view-mode-exit): If OLD-BUF is dead bury the buffer
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 0ab55d6a045..868f4621779 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1110,7 +1110,7 @@ subshells can nest."
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). 1112 ;; Patterns can be preceded by an open-paren (Bug#1320).
1113 (if (= (char-before (point)) ?\() 1113 (if (eq (char-before (point)) ?\()
1114 (backward-char 1)) 1114 (backward-char 1))
1115 (while (progn 1115 (while (progn
1116 (forward-comment (- (point-max))) 1116 (forward-comment (- (point-max)))