Merge pull request #231 from yasuyk/occur-form-isearch

Add commands to invoke (multi) occur form isearch

helm-config.el

@@ -1680,8 +1680,9 @@ Preconfigured helm to show org headlines.
 
 ;;;***
 
-;;;### (autoloads (helm-browse-code helm-multi-occur helm-occur helm-regexp)
-;;;;;;  "helm-regexp" "helm-regexp.el" (20813 57659 911717 901000))
+;;;### (autoloads (helm-browse-code helm-multi-occur-from-isearch
+;;;;;;  helm-multi-occur helm-occur-from-isearch helm-occur helm-regexp)
+;;;;;;  "helm-regexp" "helm-regexp.el" (20825 26373 0 0))
 ;;; Generated autoloads from helm-regexp.el
 
 (autoload 'helm-regexp "helm-regexp" "\
@@ -1695,6 +1696,11 @@ Preconfigured helm for Occur.
 
 \(fn)" t nil)
 
+(autoload 'helm-occur-from-isearch "helm-regexp" "\
+Invoke `helm-occur' from isearch.
+
+\(fn)" t nil)
+
 (autoload 'helm-multi-occur "helm-regexp" "\
 Preconfigured helm for multi occur.
 
@@ -1706,6 +1712,16 @@ or during the buffer selection.
 
 \(fn BUFFERS)" t nil)
 
+(autoload 'helm-multi-occur-from-isearch "helm-regexp" "\
+Invoke `helm-multi-occur' from isearch.
+
+With a prefix arg, reverse the behavior of
+`helm-moccur-always-search-in-current'.
+The prefix arg can be set before calling
+`helm-multi-occur-from-isearch' or during the buffer selection.
+
+\(fn &optional ARG)" t nil)
+
 (autoload 'helm-browse-code "helm-regexp" "\
 Preconfigured helm to browse code.
 

helm-regexp.el

@@ -449,6 +449,22 @@ the center of window, otherwise at the top of window.")
         :buffer "*helm occur*"
         :history 'helm-grep-history))
 
+;;;###autoload
+(defun helm-occur-from-isearch ()
+  "Invoke `helm-occur' from isearch."
+  (interactive)
+  (let ((input (if isearch-regexp
+                   isearch-string
+                 (regexp-quote isearch-string))))
+    (isearch-exit)
+    (setq helm-multi-occur-buffer-list (list (buffer-name (current-buffer))))
+    (helm-occur-init-source)
+    (helm-attrset 'name "Occur" helm-source-occur)
+    (helm :sources 'helm-source-occur
+          :buffer "*helm occur*"
+          :history 'helm-grep-history
+          :input input)))
+
 ;;;###autoload
 (defun helm-multi-occur (buffers)
   "Preconfigured helm for multi occur.
@@ -468,6 +484,28 @@ or during the buffer selection."
              helm-moccur-always-search-in-current)))
     (helm-multi-occur-1 buffers)))
 
+;;;###autoload
+(defun helm-multi-occur-from-isearch (&optional arg)
+  "Invoke `helm-multi-occur' from isearch.
+
+With a prefix arg, reverse the behavior of
+`helm-moccur-always-search-in-current'.
+The prefix arg can be set before calling
+`helm-multi-occur-from-isearch' or during the buffer selection."
+  (interactive "p")
+  (let ((helm-moccur-always-search-in-current
+         (if (or current-prefix-arg
+                 helm-current-prefix-arg)
+             (not helm-moccur-always-search-in-current)
+           helm-moccur-always-search-in-current))
+        (input (if isearch-regexp
+                   isearch-string
+                 (regexp-quote isearch-string))))
+    (isearch-exit)
+    (helm-multi-occur-1
+     (helm-comp-read "Buffers: " (helm-buffer-list) :marked-candidates t)
+     input)))
+
 ;;;###autoload
 (defun helm-browse-code ()
   "Preconfigured helm to browse code."