[elpa] master aa311e7: [el-search] Fix search setup with non-nil occur flag

[Michael Heerdegen]

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

    [el-search] Fix search setup with non-nil occur flag
    
    Also bump version to 1.8.6.
    
    * packages/el-search/el-search.el (el-search-setup-search-1): Skip
    parts of setup when 'el-search-occur-flag' is non-nil.
---
 packages/el-search/el-search.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 55b7a53..1edb198 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -7,7 +7,7 @@
 ;; Created: 29 Jul 2015
 ;; Keywords: lisp
 ;; Compatibility: GNU Emacs 25
-;; Version: 1.8.5
+;; Version: 1.8.6
 ;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
 
 
@@ -1854,14 +1854,16 @@ Go back to the place where the search had been started."
   (setq el-search-use-transient-map t))
 
 (defun el-search-setup-search-1 (pattern get-buffer-stream  &optional 
from-here setup-function)
-  (el-search--set-search-origin-maybe)
-  (setq el-search--success nil)
+  (unless el-search-occur-flag
+    (el-search--set-search-origin-maybe)
+    (setq el-search--success nil))
   (setq el-search--current-search
         (el-search-make-search pattern get-buffer-stream))
   (when setup-function (funcall setup-function el-search--current-search))
   (ring-insert el-search-history el-search--current-search)
   (when from-here (setq el-search--temp-buffer-flag nil))
-  (el-search-prefix-key-maybe-set-transient-map))
+  (unless el-search-occur-flag
+    (el-search-prefix-key-maybe-set-transient-map)))
 
 (defun el-search-setup-search (pattern get-buffer-stream &optional 
setup-function from-here)
   "Create and start a new el-search.