diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ansi-color.el | 2 | ||||
| -rw-r--r-- | lisp/shell.el | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab2fb6207a2..858543834e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2009-12-05 Chong Yidong <cyd@stupidchicken.com> + * shell.el (shell): Require ansi-color (Bug#5113). + + * ansi-color.el (ansi-color-for-comint-mode): Default to t. + * hl-line.el (global-hl-line-highlight): Minor doc fix (Bug#4925). 2009-12-05 Alan Mackenzie <acm@muc.de> diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index e343f560169..f691aca2d1b 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -157,7 +157,7 @@ map. This color map is stored in the variable `ansi-color-map'." ;; Convenience functions for comint modes (eg. shell-mode) -(defcustom ansi-color-for-comint-mode nil +(defcustom ansi-color-for-comint-mode t "Determines what to do with comint output. If nil, do nothing. If the symbol `filter', then filter all SGR control sequences. diff --git a/lisp/shell.el b/lisp/shell.el index 0f7eca3557e..dbc64c10908 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -554,6 +554,7 @@ Otherwise, one argument `-i' is passed to the shell. (read-file-name "Default directory: " default-directory default-directory t nil 'file-directory-p)))))))) + (require 'ansi-color) (setq buffer (get-buffer-create (or buffer "*shell*"))) ;; Pop to buffer, so that the buffer's window will be correctly set ;; when we call comint (so that comint sets the COLUMNS env var properly). |