diff options
| author | Michalis V | 2021-08-27 18:46:04 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-08-27 18:46:04 +0200 |
| commit | 9224a863192b1317ef307bcc76abfdfbad73b796 (patch) | |
| tree | e3be1358ee2c0eb845adbc4967ae1811ab163fb7 | |
| parent | e26d628a4ea197d1e1ae39f51c5ebaecec4f6483 (diff) | |
| download | emacs-9224a863192b1317ef307bcc76abfdfbad73b796.tar.gz emacs-9224a863192b1317ef307bcc76abfdfbad73b796.zip | |
Fix completion of extended "..." syntax in eshell
* lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): Expand
"..." (bug#19626).
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index cbfe0b81545..4fd0afbeb88 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | 72 | ||
| 73 | (require 'esh-mode) | 73 | (require 'esh-mode) |
| 74 | (require 'esh-util) | 74 | (require 'esh-util) |
| 75 | (require 'em-dirs) | ||
| 75 | 76 | ||
| 76 | (eval-when-compile | 77 | (eval-when-compile |
| 77 | (require 'cl-lib) | 78 | (require 'cl-lib) |
| @@ -377,8 +378,12 @@ to writing a completion function." | |||
| 377 | (cl-assert (eq (car result) 'quote)) | 378 | (cl-assert (eq (car result) 'quote)) |
| 378 | (cadr result)) | 379 | (cadr result)) |
| 379 | arg))) | 380 | arg))) |
| 380 | (if (numberp val) | 381 | (cond ((numberp val) |
| 381 | (setq val (number-to-string val))) | 382 | (setq val (number-to-string val))) |
| 383 | ;; expand .../ etc that only eshell understands to | ||
| 384 | ;; standard ../../ | ||
| 385 | ((string-match "\\.\\.\\.+/" val) | ||
| 386 | (setq val (eshell-expand-multiple-dots val)))) | ||
| 382 | (or val ""))) | 387 | (or val ""))) |
| 383 | args) | 388 | args) |
| 384 | posns))) | 389 | posns))) |