(sh-font-lock-heredoc): Allow

optional backslash at the start of the here-document delimiter.
(sh-font-lock-syntactic-keywords): Likewise.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 21a717c3863c5286822ed94c40893951585e7ed1..358b1fd22a5a9d6cf8857862c0a8254e3f3d936e 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -829,7 +829,7 @@ See `sh-feature'.")
                "\\(\n\\)")))
       (unless (assoc ere font-lock-syntactic-keywords)
        (let* ( ;; A rough regexp that should find us back.
-              (sre (concat "<<\\(-\\)?\\s-*['\"]?"
+              (sre (concat "<<\\(-\\)?\\s-*\\\\?['\"]?"
                            (regexp-quote string) "['\"]?[ \t\n]"))
               (code `(cond
                       ((save-excursion (re-search-backward ,sre nil t))
@@ -875,7 +875,7 @@ See `sh-feature'.")
   ;; of the shell command language (under `quoting') but with `$' removed.
   `(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 ,sh-st-symbol)
     ;; Find HEREDOC starters and add a corresponding rule for the ender.
-    ("[^<>]<<\\(-\\)?\\s-*\\(\\(['\"][^'\"]+['\"]\\|\\sw\\|\\s_\\)+\\).*\\(\n\\)"
+    ("[^<>]<<\\(-\\)?\\s-*\\\\?\\(\\(['\"][^'\"]+['\"]\\|\\sw\\|\\s_\\)+\\).*\\(\n\\)"
      4 (sh-font-lock-heredoc
        (match-beginning 0) (match-string 2) (match-end 1)))
     ;; Distinguish the special close-paren in `case'.