diff options
| author | Alex Branham <alex.branham@gmail.com> | 2019-08-15 11:02:38 -0500 |
|---|---|---|
| committer | Alex Branham <alex.branham@gmail.com> | 2019-08-27 09:51:14 -0500 |
| commit | e4d17d8cb479ffeeb7dfb7320a1432722ac8df75 (patch) | |
| tree | 606992150f8a955a5473d8ce04a9e2ea7c48e8d3 /lisp/shell.el | |
| parent | 693e9be5871f4e9bcb1a4ecfe5a40e68f5433cc3 (diff) | |
| download | emacs-e4d17d8cb479ffeeb7dfb7320a1432722ac8df75.tar.gz emacs-e4d17d8cb479ffeeb7dfb7320a1432722ac8df75.tar.bz2 emacs-e4d17d8cb479ffeeb7dfb7320a1432722ac8df75.zip | |
Fix filename completion in shell mode buffers
* lisp/shell.el (shell-dynamic-complete-functions): Move
pcomplete-completions-at-point down the list so that filename
completion has a chance to complete before pcompletion.
Fixes bug#34330
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index ba7515e7bad..fb2c36fa733 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -184,13 +184,16 @@ shell buffer. The value may depend on the operating system or shell." shell-environment-variable-completion shell-command-completion shell-c-a-p-replace-by-expanded-directory - pcomplete-completions-at-point shell-filename-completion - comint-filename-completion) + comint-filename-completion + ;; Put `pcomplete-completions-at-point' last so that other + ;; functions can run before it does, see bug#34330. + pcomplete-completions-at-point) "List of functions called to perform completion. This variable is used to initialize `comint-dynamic-complete-functions' in the shell buffer." :type '(repeat function) + :version "27.1" :group 'shell) (defcustom shell-command-regexp "[^;&|\n]+" |