diff options
| author | Miles Bader <miles@gnu.org> | 2005-04-09 02:16:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-04-09 02:16:29 +0000 |
| commit | 768d4533ce51d61ce065b28f63aae43c7be0d1cc (patch) | |
| tree | fb2d103d5c9354b3a15550b160bba0ff2e22c418 /lisp/progmodes/sh-script.el | |
| parent | 918bcc18650840562677f841aa0bcaa34a069be5 (diff) | |
| parent | 2a9e192d3815d2c34fdd41d52590027805bc9055 (diff) | |
| download | emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.gz emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.bz2 emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
Diffstat (limited to 'lisp/progmodes/sh-script.el')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 6e8062deb34..2fc917c89c6 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -574,7 +574,7 @@ documents - you must insert literal tabs by hand.") ;; but it *did* have an asterisk in the docstring! (defcustom sh-builtins '((bash sh-append posix - "." "alias" "bg" "bind" "builtin" "compgen" "complete" + "." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete" "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history" "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt" "source" "suspend" "typeset" "unalias") @@ -779,7 +779,10 @@ See `sh-feature'.") ;; Font-Lock support (defface sh-heredoc-face - '((((class color) + '((((min-colors 88) (class color) + (background dark)) + (:foreground "yellow1" :weight bold)) + (((class color) (background dark)) (:foreground "yellow" :weight bold)) (((class color) @@ -791,6 +794,10 @@ See `sh-feature'.") :group 'sh-indentation) (defvar sh-heredoc-face 'sh-heredoc-face) +(defface sh-escaped-newline '((t :inherit font-lock-string-face)) + "Face used for (non-escaped) backslash at end of a line in Shell-script mode." + :group 'sh-script + :version "22.1") (defvar sh-font-lock-keywords '((csh sh-append shell @@ -815,7 +822,7 @@ See `sh-feature'.") ;; The next entry is only used for defining the others (shell sh-append executable-font-lock-keywords ;; Using font-lock-string-face here confuses sh-get-indent-info. - ("\\\\$" 0 font-lock-warning-face) + ("\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\)$" 3 'sh-escaped-newline) ("\\\\[^A-Za-z0-9]" 0 font-lock-string-face) ("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1 font-lock-variable-name-face)) |