Merge from trunk after a lot of time.

[gnu-emacs] / lisp / eshell / em-basic.el

diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index e07bc75f89adc02a1d2168c45e5e875c15995516..c440bd0a9287b9f31d7bc0d7341136c7487a6a68 100644 (file)
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,6 +1,6 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -59,9 +59,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'esh-util))
-
+(require 'esh-util)
 (require 'eshell)
 (require 'esh-opt)