emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 929c606: ls-lisp: Drop eshell dependencies


From: Tino Calancha
Subject: [Emacs-diffs] master 929c606: ls-lisp: Drop eshell dependencies
Date: Fri, 4 Aug 2017 12:29:28 -0400 (EDT)

branch: master
commit 929c60603ca19574159c78f12f5f953c31188bc6
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    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.
---
 lisp/ls-lisp.el | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 9a4fc19..9a81ef0 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]