From 98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145 Mon Sep 17 00:00:00 2001 From: Filipp Gunbin Date: Fri, 29 Nov 2019 00:54:52 +0300 Subject: [PATCH] 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. --- lisp/dired-aux.el | 6 +++--- 1 file 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)) -- 2.39.5