diff options
| -rw-r--r-- | lisp/progmodes/sh-script.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 260c31186e2..c04a31607da 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -827,11 +827,11 @@ Calls the value of `sh-set-shell-hook' if set." | |||
| 827 | sh-shell (intern (file-name-nondirectory sh-shell-path)) | 827 | sh-shell (intern (file-name-nondirectory sh-shell-path)) |
| 828 | sh-shell-is-csh (memq sh-shell '(csh tcsh)) | 828 | sh-shell-is-csh (memq sh-shell '(csh tcsh)) |
| 829 | font-lock-defaults | 829 | font-lock-defaults |
| 830 | (list (intern-soft (format "sh-%s-font-lock-keywords" sh-shell))) | 830 | (let ((keywords (intern-soft (format "sh-%s-font-lock-keywords" |
| 831 | font-lock-keywords (if (and font-lock-keywords | 831 | sh-shell)))) |
| 832 | (boundp font-lock-keywords)) | 832 | (list (if (and keywords (boundp keywords)) |
| 833 | (symbol-value font-lock-keywords) | 833 | keywords |
| 834 | sh-font-lock-keywords) | 834 | 'sh-font-lock-keywords))) |
| 835 | comment-start-skip (if sh-shell-is-csh | 835 | comment-start-skip (if sh-shell-is-csh |
| 836 | "\\(^\\|[^$]\\|\\$[^{]\\)#+[\t ]*" | 836 | "\\(^\\|[^$]\\|\\$[^{]\\)#+[\t ]*" |
| 837 | "\\(^\\|[^$]\\|\\$[^{]\\)\\B#+[\t ]*") | 837 | "\\(^\\|[^$]\\|\\$[^{]\\)\\B#+[\t ]*") |