(shell-font-lock-keywords): Remove prompt highlighting, since this is

  now done independently of font-lock mode.

diff --git a/lisp/shell.el b/lisp/shell.el
index b93fe57402f3cdcf0bcda4632939e3430aa4d87a..ea0251bb1da0d6e8a407a25cf91ef4e5fd497e8a 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -321,8 +321,7 @@ Thus, this does not include the shell's current directory.")
   :group 'shell)
 
 (defvar shell-font-lock-keywords
-  '((eval . (cons shell-prompt-pattern 'font-lock-warning-face))
-    ("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face)
+  '(("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face)
     ("^[^ \t\n]+:.*" . font-lock-string-face)
     ("^\\[[1-9][0-9]*\\]" . font-lock-string-face))
   "Additional expressions to highlight in Shell mode.")