diff options
| author | Stefan Monnier | 2005-11-21 22:24:13 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-11-21 22:24:13 +0000 |
| commit | bd24684be07da191e3481caaa360035e287a6bea (patch) | |
| tree | 43e2ed9de9f453bd5c645d5377500ef25d946791 | |
| parent | f86711a4829c83bde8e5355181407e797b35fdc1 (diff) | |
| download | emacs-bd24684be07da191e3481caaa360035e287a6bea.tar.gz emacs-bd24684be07da191e3481caaa360035e287a6bea.zip | |
(sh-font-lock-paren): Handle continued lines in patterns.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4190ab3168..5615c03547b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-11-21 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-font-lock-paren): Handle continued lines | ||
| 4 | in patterns. | ||
| 5 | |||
| 1 | 2005-11-21 Juri Linkov <juri@jurta.org> | 6 | 2005-11-21 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * custom.el (defcustom): Update link types in docstring. | 8 | * custom.el (defcustom): Update link types in docstring. |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index bc4ca59f96a..f6928a72554 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -986,7 +986,11 @@ Point is at the beginning of the next line." | |||
| 986 | (when (memq (char-before) '(?\" ?\')) | 986 | (when (memq (char-before) '(?\" ?\')) |
| 987 | (condition-case nil (progn (backward-sexp 1) t) | 987 | (condition-case nil (progn (backward-sexp 1) t) |
| 988 | (error nil))))) | 988 | (error nil))))) |
| 989 | (forward-comment (- (point-max))) | 989 | (while (progn |
| 990 | (forward-comment (- (point-max))) | ||
| 991 | ;; Maybe we've bumped into an escaped newline. | ||
| 992 | (sh-is-quoted-p (point))) | ||
| 993 | (backward-char 1)) | ||
| 990 | (when (eq (char-before) ?|) | 994 | (when (eq (char-before) ?|) |
| 991 | (backward-char 1) t))) | 995 | (backward-char 1) t))) |
| 992 | (when (save-excursion (backward-char 2) (looking-at ";;\\|in")) | 996 | (when (save-excursion (backward-char 2) (looking-at ";;\\|in")) |