From: Chong Yidong Date: Tue, 3 Jan 2012 06:31:08 +0000 (+0800) Subject: Fix shell completion regression. X-Git-Tag: emacs-pretest-24.0.93~97^2~55^2~57 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=787cdb34ea494f0a800cd6c3f8af2fbfd69b7c29;p=emacs.git 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). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 055d929fc51..8679b2c4f59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-03 Chong Yidong + + * shell.el (shell-dynamic-complete-functions): Put + pcomplete-completions-at-point, so as to try + comint-filename-completion first (Bug#10417). + 2012-01-02 Richard Stallman * battery.el (battery-status-function): 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.