Commit 925f8c70 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

* ansi-color.el (ansi-color-for-comint-mode): Default to t.
parent 503edac9
2009-12-05 Chong Yidong <cyd@stupidchicken.com> 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). * hl-line.el (global-hl-line-highlight): Minor doc fix (Bug#4925).
2009-12-05 Alan Mackenzie <acm@muc.de> 2009-12-05 Alan Mackenzie <acm@muc.de>
......
...@@ -157,7 +157,7 @@ map. This color map is stored in the variable `ansi-color-map'." ...@@ -157,7 +157,7 @@ map. This color map is stored in the variable `ansi-color-map'."
;; Convenience functions for comint modes (eg. shell-mode) ;; 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. "Determines what to do with comint output.
If nil, do nothing. If nil, do nothing.
If the symbol `filter', then filter all SGR control sequences. If the symbol `filter', then filter all SGR control sequences.
......
...@@ -554,6 +554,7 @@ Otherwise, one argument `-i' is passed to the shell. ...@@ -554,6 +554,7 @@ Otherwise, one argument `-i' is passed to the shell.
(read-file-name (read-file-name
"Default directory: " default-directory default-directory "Default directory: " default-directory default-directory
t nil 'file-directory-p)))))))) t nil 'file-directory-p))))))))
(require 'ansi-color)
(setq buffer (get-buffer-create (or buffer "*shell*"))) (setq buffer (get-buffer-create (or buffer "*shell*")))
;; Pop to buffer, so that the buffer's window will be correctly set ;; 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). ;; when we call comint (so that comint sets the COLUMNS env var properly).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment