(isearch-last-case-fold-search): New variable.

(isearch-mode): Remember value of isearch-case-fold-search
in isearch-last-case-fold-search.
(isearch-done): Quote value of isearch-case-fold-search.
(isearch-repeat): When resuming a search, restore
isearch-case-fold-search from isearch-last-case-fold-search.

1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 2c687abee42..de6b7f6321f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -366,6 +366,8 @@ Default value, nil, means edit the string instead."
 ;   case in the search string is ignored.
 (defvar isearch-case-fold-search nil)
 
+(defvar isearch-last-case-fold-search nil)
+
 ;; Used to save default value while isearch is active
 (defvar isearch-original-minibuffer-message-timeout nil)
 
@@ -530,6 +532,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
         isearch-regexp regexp
         isearch-word word-p
         isearch-op-fun op-fun
+        isearch-last-case-fold-search isearch-case-fold-search
         isearch-case-fold-search case-fold-search
         isearch-string ""
         isearch-message ""
@@ -645,7 +648,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
   (let ((command `(isearch-resume ,isearch-string ,isearch-regexp
                                   ,isearch-word ,isearch-forward
                                   ,isearch-message
-                                  ,isearch-case-fold-search)))
+                                  ',isearch-case-fold-search)))
     (unless (equal (car command-history) command)
       (setq command-history (cons command command-history))))
 
@@ -949,7 +952,8 @@ Use `isearch-exit' to quit without signaling."
                     "")
                 isearch-message
                 (mapconcat 'isearch-text-char-description
-                           isearch-string ""))
+                           isearch-string "")
+                isearch-case-fold-search isearch-last-case-fold-search)
         ;; If already have what to search for, repeat it.
         (or isearch-success
             (progn