diff options
| author | Simon Marshall <simon@gnu.org> | 1994-10-12 09:18:53 +0000 |
|---|---|---|
| committer | Simon Marshall <simon@gnu.org> | 1994-10-12 09:18:53 +0000 |
| commit | c156572ff2aa3d2cd64e7a6e93e7167c987a5aca (patch) | |
| tree | 1815771627017b762777e7383db97f144b413dae /lisp/shell.el | |
| parent | 0ffb818c8fb6b5d4b65ff4c0f58e61ff08fe8dc6 (diff) | |
| download | emacs-c156572ff2aa3d2cd64e7a6e93e7167c987a5aca.tar.gz | |
* shell.el: (shell-font-lock-keywords): Add `\n' to [^] regexps.
(shell-mode): Set font-lock-defaults.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 594ea0bf444..abf901f870c 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -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 @@ Thus, this does not include the shell's current directory.") (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 @@ buffer." (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) |