From: Glenn Morris <rgm@gnu.org>
Date: Thu, 23 May 2013 07:55:52 +0000 (-0700)
Subject: Silence em-ls compilation
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~227^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7efe099165836487f8a9276122d9eece1e4514be;p=emacs.git

Silence em-ls compilation

* lisp/eshell/em-ls.el: Adjust requires.
(eshell-glob-regexp): Declare.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddd89f7cae9..44dd2c61b50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,6 +30,8 @@
 	* progmodes/vera-mode.el (he-init-string, he-dabbrev-beg)
 	(he-string-member, he-reset-string, he-substitute-string): Declare.
 
+	* eshell/em-ls.el: Adjust requires.
+	(eshell-glob-regexp): Declare.
 	* eshell/em-tramp.el: Adjust requires.
 	(eshell-parse-command): Autoload.
 	* 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 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'eshell))
 (require 'cl-lib)
 (require 'esh-util)
 (require 'esh-opt)
+(eval-when-compile (require 'eshell))
 
 ;;;###autoload
 (progn
@@ -334,6 +334,8 @@ instead."
 (defvar ange-cache)
 (defvar dired-flag)
 
+(declare-function eshell-glob-regexp "em-glob" (pattern))
+
 (defun eshell-do-ls (&rest args)
   "Implementation of \"ls\" in Lisp, passing ARGS."
   (funcall flush-func -1)