diff options
| author | Eli Zaretskii | 2018-03-06 22:45:33 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-03-06 22:45:33 +0200 |
| commit | c797bc90f5c63ad5ad01c1caa54f6d236a283efe (patch) | |
| tree | d288c20a57d09f064bcee2703aa50a686c335347 /lisp/eshell | |
| parent | add48d206463255030a7cc958faa8efb63197836 (diff) | |
| parent | 0efe0bd233de20bfb5bd9d06b255fc8ecf04602b (diff) | |
| download | emacs-c797bc90f5c63ad5ad01c1caa54f6d236a283efe.tar.gz emacs-c797bc90f5c63ad5ad01c1caa54f6d236a283efe.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 1f440077465..b56cf168a2b 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el | |||
| @@ -167,6 +167,9 @@ to writing a completion function." | |||
| 167 | (eshell-cmpl--custom-variable-docstring 'pcomplete-suffix-list) | 167 | (eshell-cmpl--custom-variable-docstring 'pcomplete-suffix-list) |
| 168 | :type (get 'pcomplete-suffix-list 'custom-type) | 168 | :type (get 'pcomplete-suffix-list 'custom-type) |
| 169 | :group 'pcomplete) | 169 | :group 'pcomplete) |
| 170 | ;; Only labelled obsolete in 26.1, but all it does it set | ||
| 171 | ;; pcomplete-suffix-list, which is itself obsolete since 24.1. | ||
| 172 | (make-obsolete-variable 'eshell-cmpl-suffix-list nil "24.1") | ||
| 170 | 173 | ||
| 171 | (defcustom eshell-cmpl-recexact nil | 174 | (defcustom eshell-cmpl-recexact nil |
| 172 | (eshell-cmpl--custom-variable-docstring 'pcomplete-recexact) | 175 | (eshell-cmpl--custom-variable-docstring 'pcomplete-recexact) |