diff options
| author | Paul Eggert | 2011-05-17 17:39:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-17 17:39:40 -0700 |
| commit | 7025ee00190a709853bf5b809bf86148efda3bc7 (patch) | |
| tree | e1b861b3ea59872e652462289bb7f215d5cfbfbe /lisp/shell.el | |
| parent | d2d818bf00fa3a3204abd9b31103cfca21ff8125 (diff) | |
| parent | 3870d303a44e14c460977c50473e5069742cd0b6 (diff) | |
| download | emacs-7025ee00190a709853bf5b809bf86148efda3bc7.tar.gz emacs-7025ee00190a709853bf5b809bf86148efda3bc7.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index a05fefa9c11..cba50038bc0 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -380,6 +380,8 @@ to `dirtrack-mode'." | |||
| 380 | :group 'shell | 380 | :group 'shell |
| 381 | :type '(choice (const nil) regexp)) | 381 | :type '(choice (const nil) regexp)) |
| 382 | 382 | ||
| 383 | (defvar pcomplete-parse-arguments-function) | ||
| 384 | |||
| 383 | (defun shell-completion-vars () | 385 | (defun shell-completion-vars () |
| 384 | "Setup completion vars for `shell-mode' and `read-shell-command'." | 386 | "Setup completion vars for `shell-mode' and `read-shell-command'." |
| 385 | (set (make-local-variable 'comint-completion-fignore) | 387 | (set (make-local-variable 'comint-completion-fignore) |