[nongnu] elpa/anzu 71a1a88dcd 275/288: Merge pull request #104 from agreselin/fix93

[ELPA Syncer]

branch: elpa/anzu
commit 71a1a88dcdbaf21c94e415ffee3d6bcf8cf9bade
Merge: 5bd8f5511d 7dc4abe0a0
Author: Neil Okamoto <neil.okam...@gmail.com>
Commit: GitHub <nore...@github.com>

    Merge pull request #104 from agreselin/fix93
    
    fix the displayed counter to follow the case-sensitivity toggle more 
accurately
    
    Fix issue #93
---
 anzu.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/anzu.el b/anzu.el
index 72fe2841cb..0aaae37fe3 100644
--- a/anzu.el
+++ b/anzu.el
@@ -163,10 +163,10 @@
 (defsubst anzu--construct-position-info (count overflow positions)
   (list :count count :overflow overflow :positions positions))
 
-(defsubst anzu--case-fold-search (input)
-  (when isearch-case-fold-search
-    (let ((case-fold-search nil))
-      (not (string-match-p "[A-Z]" input)))))
+(defsubst anzu--case-fold-search ()
+  (if isearch-mode
+      isearch-case-fold-search
+    case-fold-search))
 
 (defsubst anzu--word-search-p ()
   (and (not (memq anzu--last-command anzu-regexp-search-commands))
@@ -206,7 +206,7 @@
                                  (with-no-warnings
                                    (migemo-forward word bound noerror count)))
                              #'re-search-forward))
-              (case-fold-search (anzu--case-fold-search input)))
+              (case-fold-search (anzu--case-fold-search)))
           (while (and (not finish) (funcall search-func input nil t))
             (push (cons (match-beginning 0) (match-end 0)) positions)
             (cl-incf count)
@@ -235,7 +235,8 @@
 (defun anzu--use-result-cache-p (input)
   (and (eq (anzu--isearch-regexp-function) (car anzu--last-search-state))
        (eq isearch-regexp (cdr anzu--last-search-state))
-       (string= input anzu--last-isearch-string)))
+       (string= input anzu--last-isearch-string)
+       (not (eq last-command 'isearch-toggle-case-fold))))
 
 (defun anzu--update (query)
   (when (>= (length query) anzu-minimum-input-length)
@@ -585,7 +586,7 @@
     (unless (string= content anzu--last-replace-input)
       (setq anzu--last-replace-input content)
       (with-current-buffer buf
-        (let ((case-fold-search (anzu--case-fold-search from)))
+        (let ((case-fold-search (anzu--case-fold-search)))
           (dolist (ov (anzu--overlays-in-range beg (min end overlay-limit)))
             (let ((replace-evaled
                    (if (not use-regexp)