]> git.eshelyaron.com Git - emacs.git/commit
(insert-directory): Remove `ls-lisp` advice
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 10 Dec 2023 04:45:56 +0000 (23:45 -0500)
committerEshel Yaron <me@eshelyaron.com>
Thu, 21 Dec 2023 20:51:00 +0000 (21:51 +0100)
commit4d8362ca95c72f1786b1ef216e629d3b50000e2e
treeee2904804cae55928b53c320a7b2597c237901a9
parent654abc3d588e2f204fbf835f16d9ae35cc9ff64d
(insert-directory): Remove `ls-lisp` advice

Rather than have `ls-lisp` advise `insert-directory`, make
`insert-directory` call `ls-lisp.el` code directly when needed.

* lisp/files.el (files--use-insert-directory-program-p): New function.
(insert-directory): Use it to delegate to `ls-lisp--insert-directory`
when applicable.

* lisp/ls-lisp.el (ls-lisp--insert-directory): Remove `orig-fun` arg.
Don't test `ls-lisp-use-insert-directory-program` or check for a magic
file name handler; it is now the caller's responsibility.
(insert-directory): Don't add advice any more.

* lisp/dired.el (ls-lisp-use-insert-directory-program): Don't declare it.
(dired-insert-directory): Use `files--use-insert-directory-program-p` instead.
(dired-use-ls-dired): Adjust docstring to refer to
`insert-directory-program` rather than "ls".

(cherry picked from commit 29957969e5199bdab5612af68e33b3989e4bbbd2)
lisp/dired.el
lisp/files.el
lisp/ls-lisp.el