[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 095a41e 6/9: Prefer setq-local in shell.el
From: |
Stefan Kangas |
Subject: |
master 095a41e 6/9: Prefer setq-local in shell.el |
Date: |
Tue, 8 Dec 2020 03:32:13 -0500 (EST) |
branch: master
commit 095a41ed896304c668bf98eae7e472e237fe49be
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Prefer setq-local in shell.el
* lisp/shell.el (shell-completion-vars, shell-mode): Prefer
setq-local.
---
lisp/shell.el | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/lisp/shell.el b/lisp/shell.el
index 5fed651..5cc9a18 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -471,32 +471,32 @@ Shell buffers. It implements `shell-completion-execonly'
for
(defun shell-completion-vars ()
"Setup completion vars for `shell-mode' and `read-shell-command'."
- (set (make-local-variable 'comint-completion-fignore)
- shell-completion-fignore)
- (set (make-local-variable 'comint-delimiter-argument-list)
- shell-delimiter-argument-list)
- (set (make-local-variable 'comint-file-name-chars) shell-file-name-chars)
- (set (make-local-variable 'comint-file-name-quote-list)
- shell-file-name-quote-list)
- (set (make-local-variable 'comint-file-name-prefix)
- (or (file-remote-p default-directory) ""))
- (set (make-local-variable 'comint-dynamic-complete-functions)
- shell-dynamic-complete-functions)
+ (setq-local comint-completion-fignore
+ shell-completion-fignore)
+ (setq-local comint-delimiter-argument-list
+ shell-delimiter-argument-list)
+ (setq-local comint-file-name-chars shell-file-name-chars)
+ (setq-local comint-file-name-quote-list
+ shell-file-name-quote-list)
+ (setq-local comint-file-name-prefix
+ (or (file-remote-p default-directory) ""))
+ (setq-local comint-dynamic-complete-functions
+ shell-dynamic-complete-functions)
(setq-local comint-unquote-function #'shell--unquote-argument)
(setq-local comint-requote-function #'shell--requote-argument)
- (set (make-local-variable 'pcomplete-parse-arguments-function)
- #'shell--parse-pcomplete-arguments)
- (set (make-local-variable 'pcomplete-termination-string)
- (cond ((not comint-completion-addsuffix) "")
- ((stringp comint-completion-addsuffix)
- comint-completion-addsuffix)
- ((not (consp comint-completion-addsuffix)) " ")
- (t (cdr comint-completion-addsuffix))))
- (set (make-local-variable 'pcomplete-command-completion-function)
- #'shell-command-completion-function)
+ (setq-local pcomplete-parse-arguments-function
+ #'shell--parse-pcomplete-arguments)
+ (setq-local pcomplete-termination-string
+ (cond ((not comint-completion-addsuffix) "")
+ ((stringp comint-completion-addsuffix)
+ comint-completion-addsuffix)
+ ((not (consp comint-completion-addsuffix)) " ")
+ (t (cdr comint-completion-addsuffix))))
+ (setq-local pcomplete-command-completion-function
+ #'shell-command-completion-function)
;; Don't use pcomplete's defaulting mechanism, rely on
;; shell-dynamic-complete-functions instead.
- (set (make-local-variable 'pcomplete-default-completion-function) #'ignore)
+ (setq-local pcomplete-default-completion-function #'ignore)
(setq-local comint-input-autoexpand shell-input-autoexpand)
;; Not needed in shell-mode because it's inherited from comint-mode, but
;; placed here for read-shell-command.
@@ -596,7 +596,7 @@ buffer."
(and (stringp hsize)
(integerp (setq hsize (string-to-number hsize)))
(> hsize 0)
- (set (make-local-variable 'comint-input-ring-size) hsize))
+ (setq-local comint-input-ring-size hsize))
(setq comint-input-ring-file-name
(concat
remote
- master updated (0155bd0 -> 1c75ca1), Stefan Kangas, 2020/12/08
- master 0d6fca3 2/9: * lisp/array.el (array-mode): Prefer setq-local., Stefan Kangas, 2020/12/08
- master db001f8 5/9: Prefer setq-local in speedbar.el, Stefan Kangas, 2020/12/08
- master 07b317c 3/9: * lisp/locate.el (locate, locate-mode): Prefer setq-local., Stefan Kangas, 2020/12/08
- master 3b20c03 8/9: Prefer setq-local in tests, Stefan Kangas, 2020/12/08
- master 9e7b93f 7/9: Prefer setq-local in term.el, Stefan Kangas, 2020/12/08
- master 6614b67 4/9: Prefer setq-local in newcomment.el, Stefan Kangas, 2020/12/08
- master 478368a 1/9: Prefer setq-local in simple.el, Stefan Kangas, 2020/12/08
- master 095a41e 6/9: Prefer setq-local in shell.el,
Stefan Kangas <=
- master 1c75ca1 9/9: * admin/nt/dist-build/build-dep-zips.py: Remove unused import., Stefan Kangas, 2020/12/08