diff options
| author | Filipp Gunbin | 2019-11-29 00:54:52 +0300 |
|---|---|---|
| committer | Filipp Gunbin | 2019-11-29 00:58:37 +0300 |
| commit | 98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145 (patch) | |
| tree | 39b48e6d4e6d13183d0fe6e9597212b1fad05d5a | |
| parent | af724ed5942fc7de431c8d169599e7b5456dff0b (diff) | |
| download | emacs-98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145.tar.gz emacs-98f8c5fb07dcb4e20b8ba6648bdabf5c0d3b5145.zip | |
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.el | 6 |
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'." | |||
| 2876 | (dired-isearch-filenames-mode -1) | 2876 | (dired-isearch-filenames-mode -1) |
| 2877 | (remove-hook 'isearch-mode-end-hook #'dired-isearch-filenames-end t) | 2877 | (remove-hook 'isearch-mode-end-hook #'dired-isearch-filenames-end t) |
| 2878 | (unless isearch-suspended | 2878 | (unless isearch-suspended |
| 2879 | (custom-reevaluate-setting 'dired-isearch-filenames))) | 2879 | (kill-local-variable 'dired-isearch-filenames))) |
| 2880 | 2880 | ||
| 2881 | (defun dired-isearch-filter-filenames (beg end) | 2881 | (defun dired-isearch-filter-filenames (beg end) |
| 2882 | "Test whether some part of the current search match is inside a file name. | 2882 | "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')." | |||
| 2889 | (defun dired-isearch-filenames () | 2889 | (defun dired-isearch-filenames () |
| 2890 | "Search for a string using Isearch only in file names in the Dired buffer." | 2890 | "Search for a string using Isearch only in file names in the Dired buffer." |
| 2891 | (interactive) | 2891 | (interactive) |
| 2892 | (setq dired-isearch-filenames t) | 2892 | (set (make-local-variable 'dired-isearch-filenames) t) |
| 2893 | (isearch-forward nil t)) | 2893 | (isearch-forward nil t)) |
| 2894 | 2894 | ||
| 2895 | ;;;###autoload | 2895 | ;;;###autoload |
| 2896 | (defun dired-isearch-filenames-regexp () | 2896 | (defun dired-isearch-filenames-regexp () |
| 2897 | "Search for a regexp using Isearch only in file names in the Dired buffer." | 2897 | "Search for a regexp using Isearch only in file names in the Dired buffer." |
| 2898 | (interactive) | 2898 | (interactive) |
| 2899 | (setq dired-isearch-filenames t) | 2899 | (set (make-local-variable 'dired-isearch-filenames) t) |
| 2900 | (isearch-forward-regexp nil t)) | 2900 | (isearch-forward-regexp nil t)) |
| 2901 | 2901 | ||
| 2902 | 2902 | ||