Merge from origin/emacs-28

c0815aca18 Fix typos in in 'reset-language-environment'
ea65de7577 eshell-complete-parse-arguments: don't use string-match on...
This commit is contained in:
Stefan Kangas 2021-12-28 06:30:38 +01:00
commit 036e88ce2f
2 changed files with 4 additions and 4 deletions

View file

@ -380,7 +380,7 @@ to writing a completion function."
(setq val (number-to-string val)))
;; expand .../ etc that only eshell understands to
;; standard ../../
((string-match "\\.\\.\\.+/" val)
((and (stringp val)) (string-match "\\.\\.\\.+/" val)
(setq val (eshell-expand-multiple-dots val))))
(or val "")))
args)