diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-01-03 14:31:08 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-03 14:31:08 +0800 |
| commit | 787cdb34ea494f0a800cd6c3f8af2fbfd69b7c29 (patch) | |
| tree | cf8205ce6213fa0488460b6e41e330c8337ebdc6 /lisp/shell.el | |
| parent | b81d40f0fe43db0c6a4d71e1aaea6b2c65b27395 (diff) | |
| download | emacs-787cdb34ea494f0a800cd6c3f8af2fbfd69b7c29.tar.gz | |
Fix shell completion regression.
* lisp/shell.el (shell-dynamic-complete-functions): Put
pcomplete-completions-at-point, so as to try
comint-filename-completion first (Bug#10417).
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 7da1add8e9a..4e570c6326a 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -187,10 +187,11 @@ This is a fine thing to set in your `.emacs' file.") shell-environment-variable-completion shell-command-completion shell-c-a-p-replace-by-expanded-directory - pcomplete-completions-at-point shell-filename-completion - ;; Not sure when this one would still be useful. --Stef - comint-filename-completion) + comint-filename-completion + ;; This goes last, so that `comint-filename-completion' can handle + ;; `shell-completion-execonly' (Bug#10417). + 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. |