diff options
| author | Eli Zaretskii | 2019-03-15 11:15:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-03-15 11:15:06 +0200 |
| commit | 0f325d193e3787bf0e69d539783dd1ce414463c3 (patch) | |
| tree | b13b453d16ff1bc31470d2a18b33632ddd384490 | |
| parent | bc75589b905f70753ce2ce5f854efb423781287e (diff) | |
| download | emacs-0f325d193e3787bf0e69d539783dd1ce414463c3.tar.gz emacs-0f325d193e3787bf0e69d539783dd1ce414463c3.zip | |
Don't clobber 'comint-input-autoexpand' in 'read-shell-command'
* lisp/shell.el (shell-completion-vars): Set only the
buffer-local value of 'comint-input-autoexpand'. (Bug#34815)
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index e30825cd662..78227ca7351 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -483,7 +483,7 @@ Shell buffers. It implements `shell-completion-execonly' for | |||
| 483 | ;; Don't use pcomplete's defaulting mechanism, rely on | 483 | ;; Don't use pcomplete's defaulting mechanism, rely on |
| 484 | ;; shell-dynamic-complete-functions instead. | 484 | ;; shell-dynamic-complete-functions instead. |
| 485 | (set (make-local-variable 'pcomplete-default-completion-function) #'ignore) | 485 | (set (make-local-variable 'pcomplete-default-completion-function) #'ignore) |
| 486 | (setq comint-input-autoexpand shell-input-autoexpand) | 486 | (setq-local comint-input-autoexpand shell-input-autoexpand) |
| 487 | ;; Not needed in shell-mode because it's inherited from comint-mode, but | 487 | ;; Not needed in shell-mode because it's inherited from comint-mode, but |
| 488 | ;; placed here for read-shell-command. | 488 | ;; placed here for read-shell-command. |
| 489 | (add-hook 'completion-at-point-functions 'comint-completion-at-point nil t)) | 489 | (add-hook 'completion-at-point-functions 'comint-completion-at-point nil t)) |