procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ls-lisp: Autoload call instead of cookie

Browse source 
* lisp/ls-lisp.el (eshell-extended-glob): autoload call instead of cookie.
This commit is contained in:
Tino Calancha 2017-08-02 18:11:31 +09:00
parent 49d6e59717
commit cf1da46761
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ls-lisp.el
View file

@ -479,14 +479,19 @@ not contain `d', so that a full listing is expected."
(message "%s: doesn't exist or is inaccessible" file)
(ding) (sit-for 2))))) ; to show user the message!
(declare-function eshell-extended-glob "em-glob" (glob))
;; We cannot require 'em-glob' in the top of the file:
;; ls-lisp is compiled before than eshell, and esh-groups.el
;; wouldn't be created yet. If we require 'em-glob' inside
;; `ls-lisp--dired', then this function cannot be called
;; before eshell is compiled.
;; So instead we add an autoload call here.
;; (https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01083.html).
(autoload 'eshell-extended-glob "em-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