diff options
| author | Kenichi Handa | 2013-05-23 21:04:26 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-05-23 21:04:26 +0900 |
| commit | 179a3f11d15cbc6e433f05e03cc7e40fd5ce8362 (patch) | |
| tree | 1ce423b654c3470460625730f3f42585bf5f770f /lisp/eshell/em-basic.el | |
| parent | bc9a50032c477d4276583e66312806540167007d (diff) | |
| parent | 7764286ea69667380175fe156c4e82bf789a1e09 (diff) | |
| download | emacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.tar.gz emacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.zip | |
merge trunk
Diffstat (limited to 'lisp/eshell/em-basic.el')
| -rw-r--r-- | lisp/eshell/em-basic.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index d795b8226ca..c440bd0a928 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el | |||
| @@ -59,9 +59,7 @@ | |||
| 59 | 59 | ||
| 60 | ;;; Code: | 60 | ;;; Code: |
| 61 | 61 | ||
| 62 | (eval-when-compile | 62 | (require 'esh-util) |
| 63 | (require 'esh-util)) | ||
| 64 | |||
| 65 | (require 'eshell) | 63 | (require 'eshell) |
| 66 | (require 'esh-opt) | 64 | (require 'esh-opt) |
| 67 | 65 | ||