diff options
| author | Joakim Verona | 2011-06-23 01:28:30 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-23 01:28:30 +0200 |
| commit | c5082a753011dacef505e91f1fc30a84fa75a2eb (patch) | |
| tree | 2c995eff276b6e9e68f54b4ebe76bf012231c86d /lisp/shell.el | |
| parent | 787c27e81f046cfa1c457ed405551f8ca0ddb0e8 (diff) | |
| parent | 297dde5a97c0c5c8020db72213c7f84067f1ee21 (diff) | |
| download | emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.tar.gz emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.zip | |
merge upstream
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 8a282e94160..de811543ba0 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -398,6 +398,12 @@ to `dirtrack-mode'." | |||
| 398 | (set (make-local-variable 'pcomplete-parse-arguments-function) | 398 | (set (make-local-variable 'pcomplete-parse-arguments-function) |
| 399 | ;; FIXME: This function should be moved to shell.el. | 399 | ;; FIXME: This function should be moved to shell.el. |
| 400 | #'pcomplete-parse-comint-arguments) | 400 | #'pcomplete-parse-comint-arguments) |
| 401 | (set (make-local-variable 'pcomplete-termination-string) | ||
| 402 | (cond ((not comint-completion-addsuffix) "") | ||
| 403 | ((stringp comint-completion-addsuffix) | ||
| 404 | comint-completion-addsuffix) | ||
| 405 | ((not (consp comint-completion-addsuffix)) " ") | ||
| 406 | (t (cdr comint-completion-addsuffix)))) | ||
| 401 | ;; Don't use pcomplete's defaulting mechanism, rely on | 407 | ;; Don't use pcomplete's defaulting mechanism, rely on |
| 402 | ;; shell-dynamic-complete-functions instead. | 408 | ;; shell-dynamic-complete-functions instead. |
| 403 | (set (make-local-variable 'pcomplete-default-completion-function) #'ignore) | 409 | (set (make-local-variable 'pcomplete-default-completion-function) #'ignore) |