diff options
| author | Joakim Verona | 2013-05-27 23:14:19 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-05-27 23:14:19 +0200 |
| commit | 5cf62a1639c5993c1fd6b532f92325b28a13ee79 (patch) | |
| tree | d67d1c7c583947f164ee7494601d5c9decbd6b0f /lisp/eshell/em-basic.el | |
| parent | 3b2a9bcfc08c74d95f46d634fadc758decb1c2b0 (diff) | |
| parent | 6ef3db10430c653e302ca5983ade6f8eaa186f85 (diff) | |
| download | emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.tar.gz emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.zip | |
Merge remote-tracking branch 'origin/trunk' into xwidget
Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in
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 | ||