aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-05-23 00:55:52 -0700
committerGlenn Morris2013-05-23 00:55:52 -0700
commit7efe099165836487f8a9276122d9eece1e4514be (patch)
tree5c9f3dcda16aa31961ef0307bdcc359c93c113d1
parentf707048c02fc20dd5ab7ae2cce1c15f57370d60f (diff)
downloademacs-7efe099165836487f8a9276122d9eece1e4514be.tar.gz
emacs-7efe099165836487f8a9276122d9eece1e4514be.zip
Silence em-ls compilation
* lisp/eshell/em-ls.el: Adjust requires. (eshell-glob-regexp): Declare.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/eshell/em-ls.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddd89f7cae9..44dd2c61b50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,6 +30,8 @@
30 * progmodes/vera-mode.el (he-init-string, he-dabbrev-beg) 30 * progmodes/vera-mode.el (he-init-string, he-dabbrev-beg)
31 (he-string-member, he-reset-string, he-substitute-string): Declare. 31 (he-string-member, he-reset-string, he-substitute-string): Declare.
32 32
33 * eshell/em-ls.el: Adjust requires.
34 (eshell-glob-regexp): Declare.
33 * eshell/em-tramp.el: Adjust requires. 35 * eshell/em-tramp.el: Adjust requires.
34 (eshell-parse-command): Autoload. 36 (eshell-parse-command): Autoload.
35 * eshell/em-xtra.el: Adjust requires. 37 * eshell/em-xtra.el: Adjust requires.
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index e087861d7d9..41db4cd03d1 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -26,10 +26,10 @@
26 26
27;;; Code: 27;;; Code:
28 28
29(eval-when-compile (require 'eshell))
30(require 'cl-lib) 29(require 'cl-lib)
31(require 'esh-util) 30(require 'esh-util)
32(require 'esh-opt) 31(require 'esh-opt)
32(eval-when-compile (require 'eshell))
33 33
34;;;###autoload 34;;;###autoload
35(progn 35(progn
@@ -334,6 +334,8 @@ instead."
334(defvar ange-cache) 334(defvar ange-cache)
335(defvar dired-flag) 335(defvar dired-flag)
336 336
337(declare-function eshell-glob-regexp "em-glob" (pattern))
338
337(defun eshell-do-ls (&rest args) 339(defun eshell-do-ls (&rest args)
338 "Implementation of \"ls\" in Lisp, passing ARGS." 340 "Implementation of \"ls\" in Lisp, passing ARGS."
339 (funcall flush-func -1) 341 (funcall flush-func -1)