[Emacs-diffs] /srv/bzr/emacs/trunk r112684: Silence em-ls compilation

[Glenn Morris]

------------------------------------------------------------
revno: 112684
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-23 00:55:52 -0700
message:
  Silence em-ls compilation
  
  * lisp/eshell/em-ls.el: Adjust requires.
  (eshell-glob-regexp): Declare.
modified:
  lisp/ChangeLog
  lisp/eshell/em-ls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-23 07:37:56 +0000
+++ b/lisp/ChangeLog    2013-05-23 07:55:52 +0000
@@ -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.

=== modified file 'lisp/eshell/em-ls.el'
--- a/lisp/eshell/em-ls.el      2013-05-23 04:48:40 +0000
+++ b/lisp/eshell/em-ls.el      2013-05-23 07:55:52 +0000
@@ -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 @@
 (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)