mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 22:41:06 -08:00
Code Issues Projects Releases Wiki Activity

Fix error when splicing Eshell globs and a glob expands to itself

Browse source 
This could happen when 'eshell-extended-glob' determines that a "glob"
is not really a glob.  This mainly happens for remote file names with a
"~" in them, like "/ssh:remote:~/file.txt".

* lisp/eshell/em-glob.el (eshell-extended-glob): Return a list when
'eshell-glob-splice-results' is non-nil.
* test/lisp/eshell/em-glob-tests.el
(em-glob-test/expand/splice-results)
em-glob-test/expand/no-splice-results): Extend tests.
This commit is contained in:
Jim Porter 2024-10-22 09:43:00 -07:00
parent 2289e16226
commit b7a375f5c4
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/eshell/em-glob.el
View file

@ -348,7 +348,7 @@ regular expressions, and these cannot support the above constructs."
;; always be sure if the "~" is a home directory reference or ;; always be sure if the "~" is a home directory reference or
;; part of a glob (e.g. if the argument was assembled from ;; part of a glob (e.g. if the argument was assembled from
;; variables). ;; variables).
glob (if eshell-glob-splice-results (list glob) glob)
(unwind-protect (unwind-protect
(apply #'eshell-glob-entries globs) (apply #'eshell-glob-entries globs)
(if message-shown (if message-shown

16
test/lisp/eshell/em-glob-tests.el
View file

@ -74,7 +74,13 @@ component ending in \"symlink\" is treated as a symbolic link."
;; Ensure the default expansion splices the glob. ;; Ensure the default expansion splices the glob.
(eshell-command-result-equal "funcall list *.el" '("a.el" "b.el")) (eshell-command-result-equal "funcall list *.el" '("a.el" "b.el"))
(eshell-command-result-equal "funcall list *.txt" '("c.txt")) (eshell-command-result-equal "funcall list *.txt" '("c.txt"))
(eshell-command-result-equal "funcall list *.no" '("*.no"))))) ;; When spliting, no-matches cases also return a list containing
;; the original non-matching glob.
(eshell-command-result-equal "funcall list *.no" '("*.no"))
(when (eshell-tests-remote-accessible-p)
(let ((remote (file-remote-p ert-remote-temporary-file-directory)))
(eshell-command-result-equal (format "funcall list %s~/a.el" remote)
`(,(format "%s~/a.el" remote))))))))
(ert-deftest em-glob-test/expand/no-splice-results () (ert-deftest em-glob-test/expand/no-splice-results ()
"Test that globs are treated as lists when "Test that globs are treated as lists when
@ -85,9 +91,13 @@ component ending in \"symlink\" is treated as a symbolic link."
;; Ensure the default expansion splices the glob. ;; Ensure the default expansion splices the glob.
(eshell-command-result-equal "funcall list *.el" '(("a.el" "b.el"))) (eshell-command-result-equal "funcall list *.el" '(("a.el" "b.el")))
(eshell-command-result-equal "funcall list *.txt" '(("c.txt"))) (eshell-command-result-equal "funcall list *.txt" '(("c.txt")))
;; The no-matches case is special here: the glob is just the ;; The no-matches cases are special here: the glob is just the
;; string, not the list of results. ;; string, not the list of results.
(eshell-command-result-equal "funcall list *.no" '("*.no"))))) (eshell-command-result-equal "funcall list *.no" '("*.no"))
(when (eshell-tests-remote-accessible-p)
(let ((remote (file-remote-p ert-remote-temporary-file-directory)))
(eshell-command-result-equal (format "funcall list %s~/a.el" remote)
`(,(format "%s~/a.el" remote))))))))
(ert-deftest em-glob-test/expand/explicitly-splice-results () (ert-deftest em-glob-test/expand/explicitly-splice-results ()
"Test explicitly splicing globs works the same no matter the "Test explicitly splicing globs works the same no matter the