Merge from emacs--devo--0

[gnu-emacs] / lisp / eshell / esh-mode.el

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 2da81996dfd623ac39ef9286963fc104b8eff38f..0a8c8be697f427b9bc7276c9c948de52da3cb43a 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1081,7 +1081,7 @@ This function could be in the list `eshell-output-filter-functions'."
 
 (defun eshell-handle-ansi-color ()
   "Handle ANSI color codes."
-  (require 'ansi-color)
+  (eval-and-compile (require 'ansi-color))
   (ansi-color-apply-on-region eshell-last-output-start
                               eshell-last-output-end))