diff options
author | Tino Calancha <tino.calancha@gmail.com> | 2017-08-05 00:53:48 +0900 |
---|---|---|
committer | Tino Calancha <tino.calancha@gmail.com> | 2017-08-05 01:19:05 +0900 |
commit | 929c60603ca19574159c78f12f5f953c31188bc6 (patch) | |
tree | 3da3aac6f471edcb4d23099086b90e95bd6f3e8c /lisp/ls-lisp.el | |
parent | d32d8d0ceaa05939bbf56a246707aed05a53385c (diff) | |
download | emacs-929c60603ca19574159c78f12f5f953c31188bc6.tar.gz |
ls-lisp: Drop eshell dependencies
Use 'file-expand-wildcards' instead of 'eshell-extended-glob' to
expand the wildcards.
Suggested by Fabrice Popineau in:
https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00108.html
* lisp/ls-lisp.el (ls-lisp--dired): Use file-expand-wildcards.
Diffstat (limited to 'lisp/ls-lisp.el')
-rw-r--r-- | lisp/ls-lisp.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 9a4fc197442..9a81ef07ad8 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -479,14 +479,6 @@ 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! -;; 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" ()) @@ -499,7 +491,7 @@ not contain `d', so that a full listing is expected." (if (not dir-wildcard) (funcall orig-fun dir-or-list switches) (let* ((default-directory (car dir-wildcard)) - (files (eshell-extended-glob (cdr dir-wildcard))) + (files (file-expand-wildcards (cdr dir-wildcard))) (dir (car dir-wildcard))) (if files (let ((inhibit-read-only t) |