mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

ls-lisp: Do not require em-glob at top of the file

Browse Source 
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.
This commit is contained in:
Tino Calancha 2017-07-30 20:28:33 +09:00
parent 6c106712a8
commit c8f44e4b53
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/eshell/em-ls.el
View File

@ -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 ""))

6
lisp/ls-lisp.el
View File

@ -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