diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2017-07-30 20:28:33 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2017-07-30 20:28:33 +0900 |
| commit | c8f44e4b53c40dfea1c83ad0ff3bd653e72c4f4e (patch) | |
| tree | 684c170f5863a9cc63ddd54edd56050b8f11fdf5 /lisp/ls-lisp.el | |
| parent | 6c106712a8d2ffd0c932541cb50cc59a6df732f4 (diff) | |
| download | emacs-c8f44e4b53c40dfea1c83ad0ff3bd653e72c4f4e.tar.gz | |
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.
Diffstat (limited to 'lisp/ls-lisp.el')
| -rw-r--r-- | lisp/ls-lisp.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 56780daa09f..2f723ca8ac8 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -61,7 +61,6 @@ ;;; Code: -(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 |