diff options
| author | Stefan Monnier | 2012-05-07 20:27:13 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-05-07 20:27:13 -0400 |
| commit | 1cb51c12e4a05919b6678e4fe5fc62d8fe573755 (patch) | |
| tree | 2f8e07facc41e8b07a539a0c40ba8d47d1290538 | |
| parent | 188d270185eca5ea83f2a603d7d22e37cbffaefc (diff) | |
| download | emacs-1cb51c12e4a05919b6678e4fe5fc62d8fe573755.tar.gz emacs-1cb51c12e4a05919b6678e4fe5fc62d8fe573755.zip | |
* shell.el (shell-completion-vars): Fix last change.
Fixes: debbugs:11348
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/shell.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c6a430491b3..ec29758fd51 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-05-08 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * shell.el (shell-completion-vars): Fix last change (bug#11348). | ||
| 4 | |||
| 1 | 2012-05-07 Chong Yidong <cyd@gnu.org> | 5 | 2012-05-07 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * ansi-color.el (ansi-color-process-output): Check for validity of | 7 | * ansi-color.el (ansi-color-process-output): Check for validity of |
diff --git a/lisp/shell.el b/lisp/shell.el index 737f69c021d..f7a530102ff 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -432,7 +432,7 @@ Shell buffers. It implements `shell-completion-execonly' for | |||
| 432 | (set (make-local-variable 'pcomplete-parse-arguments-function) | 432 | (set (make-local-variable 'pcomplete-parse-arguments-function) |
| 433 | #'shell-parse-pcomplete-arguments) | 433 | #'shell-parse-pcomplete-arguments) |
| 434 | (set (make-local-variable 'pcomplete-arg-quote-list) | 434 | (set (make-local-variable 'pcomplete-arg-quote-list) |
| 435 | shell-delimiter-argument-list) | 435 | comint-file-name-quote-list) |
| 436 | (set (make-local-variable 'pcomplete-termination-string) | 436 | (set (make-local-variable 'pcomplete-termination-string) |
| 437 | (cond ((not comint-completion-addsuffix) "") | 437 | (cond ((not comint-completion-addsuffix) "") |
| 438 | ((stringp comint-completion-addsuffix) | 438 | ((stringp comint-completion-addsuffix) |