summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/eshell/em-prompt.el2
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a05bdb99e26..74f791837e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2013-09-13 Glenn Morris <rgm@gnu.org>
+ * eshell/em-prompt.el (eshell/pwd): Autoload it.
+ Otherwise an error occurs if eshell-dirs module not loaded.
+
* progmodes/gdb-mi.el (gud-cont, gud-step): Declare.
2013-09-13 Michael Albinus <michael.albinus@gmx.de>
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 9b9c1095277..e79c7d7ba63 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -45,6 +45,8 @@ as is common with most shells."
:type 'hook
:group 'eshell-prompt)
+(autoload 'eshell/pwd "em-dirs")
+
(defcustom eshell-prompt-function
(function
(lambda ()