diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-28 06:30:38 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-28 06:30:38 +0100 |
| commit | 036e88ce2f35b805f37e5f3b4948c7d8e7355b2c (patch) | |
| tree | 49218c5db5a01ade0feb72be22d66419b3b66ec6 /lisp/eshell | |
| parent | b6b2f797d9df3e5562b946d5f4c690f8967c1b88 (diff) | |
| parent | c0815aca18e210e1590e47b78a01e5dd63401775 (diff) | |
| download | emacs-036e88ce2f35b805f37e5f3b4948c7d8e7355b2c.tar.gz emacs-036e88ce2f35b805f37e5f3b4948c7d8e7355b2c.tar.bz2 emacs-036e88ce2f35b805f37e5f3b4948c7d8e7355b2c.zip | |
Merge from origin/emacs-28
c0815aca18 Fix typos in in 'reset-language-environment'
ea65de7577 eshell-complete-parse-arguments: don't use string-match on...
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 8afc57bd75e..0b19d1be698 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -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) |