From 8b7182626e3dac556d1fc38a1193e7d5e386488e Mon Sep 17 00:00:00 2001
From: Leo Liu <sdl.web@gmail.com>
Date: Sun, 25 Dec 2016 14:37:51 +0800
Subject: [PATCH] Don't modify minibuffer variables globally
* lisp/files.el (cd): Use setq-local instead. (Bug#25260)
---
lisp/files.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 45646b186af..962ced4f077 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -719,13 +719,13 @@ The path separator is colon in GNU and GNU-like systems."
;; (which will lead to the use of B/a).
(minibuffer-with-setup-hook
(lambda ()
- (setq minibuffer-completion-table
- (apply-partially #'locate-file-completion-table
- cd-path nil))
- (setq minibuffer-completion-predicate
- (lambda (dir)
- (locate-file dir cd-path nil
- (lambda (f) (and (file-directory-p f) 'dir-ok))))))
+ (setq-local minibuffer-completion-table
+ (apply-partially #'locate-file-completion-table
+ cd-path nil))
+ (setq-local minibuffer-completion-predicate
+ (lambda (dir)
+ (locate-file dir cd-path nil
+ (lambda (f) (and (file-directory-p f) 'dir-ok))))))
(unless cd-path
(setq cd-path (or (parse-colon-path (getenv "CDPATH"))
(list "./"))))
--
2.39.5