diff options
| -rw-r--r-- | lisp/eshell/em-ls.el | 2 | ||||
| -rw-r--r-- | lisp/ls-lisp.el | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 948ac38b5f2..4a5adc48f2b 100644 --- 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 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 |