[Emacs-diffs] emacs/lisp ChangeLog ansi-color.el shell.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/05 21:05:55

Modified files:
        lisp           : ChangeLog ansi-color.el shell.el 

Log message:
        * shell.el (shell): Require ansi-color (Bug#5113).
        * ansi-color.el (ansi-color-for-comint-mode): Default to t.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16831&r2=1.16832
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ansi-color.el?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/shell.el?cvsroot=emacs&r1=1.169&r2=1.170

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16831
retrieving revision 1.16832
diff -u -b -r1.16831 -r1.16832
--- ChangeLog   5 Dec 2009 20:56:42 -0000       1.16831
+++ ChangeLog   5 Dec 2009 21:05:51 -0000       1.16832
@@ -1,5 +1,9 @@
 2009-12-05  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>

Index: ansi-color.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ansi-color.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ansi-color.el       17 Sep 2009 06:20:00 -0000      1.32
+++ ansi-color.el       5 Dec 2009 21:05:54 -0000       1.33
@@ -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.

Index: shell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/shell.el,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- shell.el    6 Nov 2009 05:16:28 -0000       1.169
+++ shell.el    5 Dec 2009 21:05:54 -0000       1.170
@@ -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).