aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-11-03 03:14:47 +0000
committerGlenn Morris2009-11-03 03:14:47 +0000
commitdb04f33fd16c45962469cac8b94bb26ced1a8f58 (patch)
tree774aad4161ca529b1f85743f06dd4c431deee07e
parent659f64e909614e62b939087c625fd9abfbcf7073 (diff)
downloademacs-db04f33fd16c45962469cac8b94bb26ced1a8f58.tar.gz
emacs-db04f33fd16c45962469cac8b94bb26ced1a8f58.zip
(ansi-color-apply-on-region): Autoload it...
(eshell-handle-ansi-color): ... Rather than requiring ansi-color.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/esh-mode.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 057fefd52a7..5761bac6724 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-11-03 Glenn Morris <rgm@gnu.org>
2
3 * eshell/esh-mode.el (ansi-color-apply-on-region): Autoload it...
4 (eshell-handle-ansi-color): ... Rather than requiring ansi-color.
5
12009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> 62009-11-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos): 8 * term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 0fa6347edee..1cef98794f5 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1073,9 +1073,10 @@ This function could be in the list `eshell-output-filter-functions'."
1073(custom-add-option 'eshell-output-filter-functions 1073(custom-add-option 'eshell-output-filter-functions
1074 'eshell-handle-control-codes) 1074 'eshell-handle-control-codes)
1075 1075
1076(autoload 'ansi-color-apply-on-region "ansi-color")
1077
1076(defun eshell-handle-ansi-color () 1078(defun eshell-handle-ansi-color ()
1077 "Handle ANSI color codes." 1079 "Handle ANSI color codes."
1078 (eval-and-compile (require 'ansi-color))
1079 (ansi-color-apply-on-region eshell-last-output-start 1080 (ansi-color-apply-on-region eshell-last-output-start
1080 eshell-last-output-end)) 1081 eshell-last-output-end))
1081 1082