# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1260047151 0
# Node ID f2a95599cf8cb0e7e52af5fe0041be7434e45eed
# Parent  889300e08b30aefb03f896f3720ea4691ba24ab7
* shell.el (shell): Require ansi-color (Bug#5113).
* ansi-color.el (ansi-color-for-comint-mode): Default to t.

diff -r 889300e08b30 -r f2a95599cf8c lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 05 20:56:42 2009 +0000
+++ b/lisp/ChangeLog	Sat Dec 05 21:05:51 2009 +0000
@@ -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 -r 889300e08b30 -r f2a95599cf8c lisp/ansi-color.el
--- a/lisp/ansi-color.el	Sat Dec 05 20:56:42 2009 +0000
+++ b/lisp/ansi-color.el	Sat Dec 05 21:05:51 2009 +0000
@@ -157,7 +157,7 @@
 ;; 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 -r 889300e08b30 -r f2a95599cf8c lisp/shell.el
--- a/lisp/shell.el	Sat Dec 05 20:56:42 2009 +0000
+++ b/lisp/shell.el	Sat Dec 05 21:05:51 2009 +0000
@@ -554,6 +554,7 @@
 		      (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).