changeset 9485:2685c7803c18

* shell.el: (shell-font-lock-keywords): Add `\n' to [^] regexps. (shell-mode): Set font-lock-defaults.
author Simon Marshall <simon@gnu.org>
date Wed, 12 Oct 1994 09:18:53 +0000
parents 255efa3fb8d0
children 66079477d0e6
files lisp/shell.el
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/shell.el	Wed Oct 12 09:15:14 1994 +0000
+++ b/lisp/shell.el	Wed Oct 12 09:18:53 1994 +0000
@@ -94,6 +94,7 @@
 ;;; m-c-b   shell-backward-command          Backward a shell command
 ;;; 	    dirs    			    Resync the buffer's dir stack
 ;;; 	    dirtrack-toggle                 Turn dir tracking on/off
+;;;         shell-strip-ctrl-m              Remove trailing ^Ms from output
 ;;;
 ;;; The shell mode hook is shell-mode-hook
 ;;; comint-prompt-regexp is initialised to shell-prompt-pattern, for backwards
@@ -274,7 +275,7 @@
 (defvar shell-font-lock-keywords
   (list (cons shell-prompt-pattern 'font-lock-keyword-face)
 	'("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face)
-	'("^[^ \t]+:.*$" . font-lock-string-face)
+	'("^[^ \t\n]+:.*$" . font-lock-string-face)
 	'("^\\[[1-9][0-9]*\\]" . font-lock-string-face))
   "Additional expressions to highlight in Shell mode.")
 
@@ -337,8 +338,8 @@
   (setq comint-dynamic-complete-functions shell-dynamic-complete-functions)
   (make-local-variable 'paragraph-start)
   (setq paragraph-start comint-prompt-regexp)
-  (make-local-variable 'font-lock-keywords)
-  (setq font-lock-keywords shell-font-lock-keywords)
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(shell-font-lock-keywords t))
   (make-local-variable 'shell-dirstack)
   (setq shell-dirstack nil)
   (setq shell-last-dir nil)