[Emacs-diffs] Changes to emacs/lisp/progmodes/sh-script.el

[Glenn Morris]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.146 
emacs/lisp/progmodes/sh-script.el:1.147
*** emacs/lisp/progmodes/sh-script.el:1.146     Fri Mar 25 08:47:00 2005
--- emacs/lisp/progmodes/sh-script.el   Tue Apr  5 13:07:42 2005
***************
*** 574,580 ****
  ;; but it *did* have an asterisk in the docstring!
  (defcustom sh-builtins
    '((bash sh-append posix
!         "." "alias" "bg" "bind" "builtin" "compgen" "complete"
            "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
            "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
            "source" "suspend" "typeset" "unalias")
--- 574,580 ----
  ;; but it *did* have an asterisk in the docstring!
  (defcustom sh-builtins
    '((bash sh-append posix
!         "." "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")
***************
*** 791,796 ****
--- 791,800 ----
    :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,821 ****
      ;; 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)
           ("\\\\[^A-Za-z0-9]" 0 font-lock-string-face)
           ("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1
             font-lock-variable-name-face))
--- 819,825 ----
      ;; 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.
!            ("\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\)$" 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))