aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2013-09-13 00:10:30 -0700
committerGlenn Morris2013-09-13 00:10:30 -0700
commit2ada368ae92ff7b39e3beef407351fdfd31ae87b (patch)
tree43f39a4d3da6db1f4789dcb47916fdcf40aa564e /lisp
parentfcef2e13960af4f30ced7571771f581091d18c17 (diff)
downloademacs-2ada368ae92ff7b39e3beef407351fdfd31ae87b.tar.gz
emacs-2ada368ae92ff7b39e3beef407351fdfd31ae87b.zip
* lisp/eshell/esh-ext.el (eshell-search-path): Declare.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/eshell/esh-ext.el4
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74f791837e2..53153b22f4a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-09-13 Glenn Morris <rgm@gnu.org> 12013-09-13 Glenn Morris <rgm@gnu.org>
2 2
3 * eshell/esh-ext.el (eshell-search-path): Declare.
4
3 * eshell/em-prompt.el (eshell/pwd): Autoload it. 5 * eshell/em-prompt.el (eshell/pwd): Autoload it.
4 Otherwise an error occurs if eshell-dirs module not loaded. 6 Otherwise an error occurs if eshell-dirs module not loaded.
5 7
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 8b312a2c25c..e2cca35a267 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -92,6 +92,10 @@ since nothing else but Eshell will be able to understand
92 (setq list (cdr list))) 92 (setq list (cdr list)))
93 file))) 93 file)))
94 94
95;; This file provides itself then eval-when-compile loads files that require it.
96;; This causes spurious "might not be defined at runtime" warnings.
97(declare-function eshell-search-path "esh-ext" (name))
98
95(defcustom eshell-windows-shell-file 99(defcustom eshell-windows-shell-file
96 (if (eshell-under-windows-p) 100 (if (eshell-under-windows-p)
97 (if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)" 101 (if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"