summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipp Gunbin <fgunbin@fastmail.fm>2019-11-29 00:54:52 +0300
committerFilipp Gunbin <fgunbin@fastmail.fm>2019-11-29 00:58:37 +0300
commit98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145 (patch)
tree39b48e6d4e6d13183d0fe6e9597212b1fad05d5a
parentaf724ed5942fc7de431c8d169599e7b5456dff0b (diff)
downloademacs-98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145.tar.gz
Do not call custom-reevaluate-setting in dired-isearch-filenames-end
* lisp/dired-aux.el (dired-isearch-filenames-end) (dired-isearch-filenames, dired-isearch-filenames-regexp): Use temporary local variable for dired-isearch-filenames instead of custom-reevaluate-setting (Bug#30187). Without this fix, the value set in .emacs with plain setq would be lost after one isearch.
-rw-r--r--lisp/dired-aux.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 4d7abd1ef6f..fb1ad6266d6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2876,7 +2876,7 @@ Intended to be added to `isearch-mode-hook'."
(dired-isearch-filenames-mode -1)
(remove-hook 'isearch-mode-end-hook #'dired-isearch-filenames-end t)
(unless isearch-suspended
- (custom-reevaluate-setting 'dired-isearch-filenames)))
+ (kill-local-variable 'dired-isearch-filenames)))
(defun dired-isearch-filter-filenames (beg end)
"Test whether some part of the current search match is inside a file name.
@@ -2889,14 +2889,14 @@ is part of a file name (i.e., has the text property `dired-filename')."
(defun dired-isearch-filenames ()
"Search for a string using Isearch only in file names in the Dired buffer."
(interactive)
- (setq dired-isearch-filenames t)
+ (set (make-local-variable 'dired-isearch-filenames) t)
(isearch-forward nil t))
;;;###autoload
(defun dired-isearch-filenames-regexp ()
"Search for a regexp using Isearch only in file names in the Dired buffer."
(interactive)
- (setq dired-isearch-filenames t)
+ (set (make-local-variable 'dired-isearch-filenames) t)
(isearch-forward-regexp nil t))