ls-lisp: Do not require em-glob at top of the file

Require em-glob inside 'ls-lisp--dired'.  This is necessary to
not break the Emacs build.
See following thread for details:
https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01083.html
* lisp/ls-lisp.el (dired-goto-next-file)
(dired-read-dir-and-switches, eshell-extended-glob):
Add function declarations.
* lisp/eshell/em-ls.el (dired-goto-next-file): Fix function declaration.

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 948ac38b5f282ea52da870cc2219593a00da71ef..4a5adc48f2b936d94400b4587ee9dd9bbf201da3 100644 (file)
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -283,7 +283,7 @@ instead."
 
 (declare-function eshell-extended-glob "em-glob" (glob))
 (declare-function dired-read-dir-and-switches "dired" (str))
-(declare-function dired-goto-next-file "em-glob" ())
+(declare-function dired-goto-next-file "dired" ())
 
 (defun eshell-ls--dired (orig-fun dir-or-list &optional switches)
   (interactive (dired-read-dir-and-switches ""))

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 56780daa09f7206adc9748dd2f0ce7f85dfee815..2f723ca8ac83f4c25f08f9d9c1251081e298c2b3 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -61,7 +61,6 @@
 ;;; Code:
 
 \f
-(require 'em-glob)
 
 (defgroup ls-lisp nil
   "Emulate the ls program completely in Emacs Lisp."
@@ -481,8 +480,13 @@ not contain `d', so that a full listing is expected."
        (ding) (sit-for 2)))))          ; to show user the message!
 
 
+(declare-function eshell-extended-glob "em-glob" (glob))
+(declare-function dired-read-dir-and-switches "dired" (str))
+(declare-function dired-goto-next-file "dired" ())
+
 (defun ls-lisp--dired (orig-fun dir-or-list &optional switches)
   (interactive (dired-read-dir-and-switches ""))
+  (require 'em-glob)
   (if (consp dir-or-list)
       (funcall orig-fun dir-or-list switches)
     (let ((dir-wildcard (insert-directory-wildcard-in-dir-p