From: Tino Calancha Date: Sat, 4 Jun 2016 22:06:12 +0000 (+0300) Subject: isearch-edit-string resumes multi isearches X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/700afe62a4cbd9ecf24551ddc4747e6319fb51a2 isearch-edit-string resumes multi isearches * lisp/isearch.el (with-isearch-suspended): Remember and restore multi-isearch variables. (Bug#21663) --- diff --git a/lisp/isearch.el b/lisp/isearch.el index 7360a0b374..eabf05b0b1 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1259,6 +1259,11 @@ You can update the global isearch variables by setting new values to (isearch-adjusted isearch-adjusted) (isearch-yank-flag isearch-yank-flag) (isearch-error isearch-error) + + (multi-isearch-file-list-new multi-isearch-file-list) + (multi-isearch-buffer-list-new multi-isearch-buffer-list) + (multi-isearch-next-buffer-function multi-isearch-next-buffer-current-function) + (multi-isearch-current-buffer-new multi-isearch-current-buffer) ;;; Don't bind this. We want isearch-search, below, to set it. ;;; And the old value won't matter after that. ;;; (isearch-other-end isearch-other-end) @@ -1313,7 +1318,10 @@ You can update the global isearch variables by setting new values to isearch-message isearch-new-message isearch-forward isearch-new-forward isearch-regexp-function isearch-new-regexp-function - isearch-case-fold-search isearch-new-case-fold) + isearch-case-fold-search isearch-new-case-fold + multi-isearch-current-buffer multi-isearch-current-buffer-new + multi-isearch-file-list multi-isearch-file-list-new + multi-isearch-buffer-list multi-isearch-buffer-list-new) ;; Restore the minibuffer message before moving point. (funcall (or isearch-message-function #'isearch-message) nil t)