(ansi-color-apply-on-region): Autoload it...

(eshell-handle-ansi-color): ... Rather than requiring ansi-color.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 057fefd52a7adc1815810f463cac1836e46dccb7..5761bac67241065f3ee2bb0ecdfc9e425b2b50a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-03  Glenn Morris  <rgm@gnu.org>
+
+       * eshell/esh-mode.el (ansi-color-apply-on-region): Autoload it...
+       (eshell-handle-ansi-color): ... Rather than requiring ansi-color.
+
 2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * 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 0fa6347edeedf9edb972f182901e93b958e3e150..1cef98794f52a6ad462d7c94fe2fe6a534bf1358 100644 (file)
--- 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'."
 (custom-add-option 'eshell-output-filter-functions
                   'eshell-handle-control-codes)
 
+(autoload 'ansi-color-apply-on-region "ansi-color")
+
 (defun eshell-handle-ansi-color ()
   "Handle ANSI color codes."
-  (eval-and-compile (require 'ansi-color))
   (ansi-color-apply-on-region eshell-last-output-start
                               eshell-last-output-end))