* shell.el (shell): Require ansi-color (Bug#5113).

* ansi-color.el (ansi-color-for-comint-mode): Default to t.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab2fb6207a260a0890c0300236aee9789486b9f3..858543834e2166e9ab86fc6eee2a0274b07de664 100644 (file)
--- 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 e343f560169a53439791fb718076b987e48584db..f691aca2d1b79a36506d4cd56373a4aa7f2c25d3 100644 (file)
--- 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 0f7eca3557ecc1622248bd57841cdaeb321b59c5..dbc64c10908fdecb5b8d9c01f8fad5c24100b057 100644 (file)
--- 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).