diff options
| author | Stefan Monnier | 2006-07-18 21:03:59 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-07-18 21:03:59 +0000 |
| commit | c6b71045505c0a3b941f75f2ae481a463f8b86c3 (patch) | |
| tree | 06eb0589988c645b7548d0d53988dc2422014ba6 /lisp | |
| parent | 2381d38d0af85e3a97eb9f98c66a7259a2a3e1e1 (diff) | |
| download | emacs-c6b71045505c0a3b941f75f2ae481a463f8b86c3.tar.gz emacs-c6b71045505c0a3b941f75f2ae481a463f8b86c3.zip | |
(sh-font-lock-keywords-1): Revert inadvertently installed patch hunk.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 885ffca4f24..079e012d15f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2006-07-18 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2006-07-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * progmodes/sh-script.el (sh-font-lock-keywords-1): | ||
| 4 | Revert inadvertently installed patch hunk. | ||
| 5 | |||
| 3 | * progmodes/compile.el (compilation-find-file): Handle the | 6 | * progmodes/compile.el (compilation-find-file): Handle the |
| 4 | cases where the user selects a non-existent file. | 7 | cases where the user selects a non-existent file. |
| 5 | 8 | ||
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 48b34a99311..d69229780b6 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -1561,7 +1561,7 @@ This adds rules for comments and assignments." | |||
| 1561 | (regexp-opt (sh-feature sh-builtins) t) | 1561 | (regexp-opt (sh-feature sh-builtins) t) |
| 1562 | "\\>") | 1562 | "\\>") |
| 1563 | (2 font-lock-keyword-face nil t) | 1563 | (2 font-lock-keyword-face nil t) |
| 1564 | (4 font-lock-builtin-face)) | 1564 | (6 font-lock-builtin-face)) |
| 1565 | ,@(sh-feature sh-font-lock-keywords-var-2))) | 1565 | ,@(sh-feature sh-font-lock-keywords-var-2))) |
| 1566 | (,(concat keywords "\\)\\>") | 1566 | (,(concat keywords "\\)\\>") |
| 1567 | 2 font-lock-keyword-face) | 1567 | 2 font-lock-keyword-face) |