[elpa] master a04f301 2/3: Add missing settings of some vars when restoring a previous search

[Michael Heerdegen]

branch: master
commit a04f301cf155732d2c4f6b4283b5054c2a89c042
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    Add missing settings of some vars when restoring a previous search
---
 packages/el-search/el-search.el |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 9ce2571..e6896a8 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -1183,23 +1183,28 @@ the form \(buffer-or-file-name . match-position)."
 With prefix arg, prompt for a prior search to resume, and make
 that the current search."
   (when previous-search
-    (setq el-search--current-search
-          (car (ring-ref
-                el-search-history
-                (string-to-number
-                 (let ((completion-extra-properties
-                        `(:annotation-function
-                          ,(lambda (elt)
-                             (format "  Search in %S for %S"
-                                     (el-search-head-buffer
-                                      (el-search-object-head
-                                       (car (ring-ref el-search-history 
(string-to-number elt)))))
-                                     (cadr (ring-ref el-search-history 
(string-to-number elt))))))))
-                   (completing-read
-                    "Resume previous search: "
-                    (mapcar #'prin1-to-string (number-sequence 0 (1- 
(ring-length el-search-history))))))))))
+    (let ((entry (ring-ref
+                  el-search-history
+                  (string-to-number
+                   (let ((completion-extra-properties
+                          `(:annotation-function
+                            ,(lambda (elt)
+                               (format "  Search in %S for %S"
+                                       (el-search-head-buffer
+                                        (el-search-object-head
+                                         (car (ring-ref el-search-history 
(string-to-number elt)))))
+                                       (cadr (ring-ref el-search-history 
(string-to-number elt))))))))
+                     (completing-read
+                      "Resume previous search: "
+                      (mapcar #'prin1-to-string
+                              (number-sequence 0 (1- (ring-length 
el-search-history))))))))))
+      (setq el-search--current-search  (car entry))
+      (setq el-search--current-pattern (cadr entry)))
     (setq el-search--current-matcher
-          (el-search-head-matcher (el-search-object-head 
el-search--current-search))))
+          (el-search-head-matcher (el-search-object-head 
el-search--current-search)))
+    (el-search--pushnew-to-history
+     (el-search--pp-to-string el-search--current-pattern)
+     'el-search-pattern-history))
   (if-let ((search el-search--current-search)
            (current-head (el-search-object-head search))
            (current-search-buffer (el-search-head-buffer current-head)))