X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=howm-mode.el;h=56c61bb8e970b303ff9f896b42cf1453dbf44505;hb=20724f1be1517228ca2e570b1b82e42c8a594cf1;hp=0207e88d0f80c13f1eb1a9ed1bb9e4ccc745113e;hpb=455b57a680668c2f83c5dbb0656cf814c1342aca;p=howm%2Fhowm.git

diff --git a/howm-mode.el b/howm-mode.el
index 0207e88..56c61bb 100644
--- a/howm-mode.el
+++ b/howm-mode.el
@@ -440,18 +440,46 @@ key	binding
   (howm-list-grep-general t))
 
 (defun howm-list-grep-general (&optional completion-p)
-  (let ((regexp (howm-iigrep completion-p)))
+  (let* ((action (lambda (pattern) (howm-search pattern completion-p)))
+         (regexp (howm-iigrep completion-p action)))
     (when completion-p  ;; Goto link works only for fixed string at now.
       (howm-write-history regexp))
-    (howm-search regexp completion-p)))
+    (funcall action regexp)))
 
-(defun howm-iigrep (completion-p)
-  (iigrep-with-grep (howm-iigrep-command-for-pattern completion-p)
-      howm-iigrep-show-what
+(defun howm-search (regexp fixed-p &optional emacs-regexp filter bufname)
+  (if (string= regexp "")
+      (howm-list-all)
+    (howm-message-time "search"
+      (let* ((trio (howm-call-view-search-internal regexp fixed-p emacs-regexp))
+             (kw (car trio))
+             (name (or bufname (cadr trio)))
+             (items (cl-caddr trio)))
+        (when filter
+          (setq items (funcall filter items)))
+        (howm-normalize-show name items (or emacs-regexp regexp) nil nil kw)
+        (howm-record-view-window-configuration)))))
+
+(defun howm-iigrep (completion-p action)
+  (howm-with-iigrep (howm-iigrep-command-for-pattern completion-p)
+      howm-iigrep-show-what action
     (if completion-p
         (howm-completing-read-keyword)
       (read-from-minibuffer "Search all (grep): "))))
 
+(defmacro howm-with-iigrep (command-for-pattern show-what action &rest body)
+  (declare (indent 3))
+  `(let ((*iigrep-post-sentinel* (howm-iigrep-post-sentinel ,action))
+         (howm-view-summary-name "*howmS(preview)*")
+         (howm-view-contents-name "*howmC(preview)*")
+         (howm-history-limit 0)
+         (*howm-show-item-filename* nil)
+         (howm-message-time nil))
+     (unwind-protect
+         (iigrep-with-grep ,command-for-pattern ,show-what
+           ,@body)
+       (mapc (lambda (b) (and (get-buffer b) (kill-buffer b)))
+             (list howm-view-summary-name howm-view-contents-name)))))
+
 (defmacro howm-iigrep-command-for-pattern (&optional fixed-p converter)
   ;; use macro due to dynamic binding. Sigh...
   `(and howm-view-use-grep
@@ -464,18 +492,12 @@ key	binding
                  (fs (cl-third trio)))
             (append (list com) (cons "-I" args) fs)))))
 
-(defun howm-search (regexp fixed-p &optional emacs-regexp filter bufname)
-  (if (string= regexp "")
-      (howm-list-all)
-    (howm-message-time "search"
-      (let* ((trio (howm-call-view-search-internal regexp fixed-p emacs-regexp))
-             (kw (car trio))
-             (name (or bufname (cadr trio)))
-             (items (cl-caddr trio)))
-        (when filter
-          (setq items (funcall filter items)))
-        (howm-normalize-show name items (or emacs-regexp regexp) nil nil kw)
-        (howm-record-view-window-configuration)))))
+(defmacro howm-iigrep-post-sentinel (action)
+  ;; use macro due to dynamic binding. Sigh...
+  `(lambda (hits pattern)
+     (when (<= hits howm-iigrep-preview-items)
+       (save-selected-window
+         (funcall ,action pattern)))))
 
 (defvar *howm-view-window-configuration* nil
   "For internal use")
@@ -503,14 +525,16 @@ key	binding
   (howm-set-command 'howm-list-migemo)
   (if completion-p
       (howm-list-grep t)
-    (let* ((roma (howm-iigrep-migemo))
-           (e-reg (howm-migemo-get-pattern roma "emacs"))
-           (g-reg (if howm-view-use-grep
-                      (howm-migemo-get-pattern roma "egrep")
-                    e-reg)))
-      (if (and e-reg g-reg)
-          (howm-search g-reg nil e-reg nil roma)
-        (message "No response from migemo-client.")))))
+    (howm-list-migemo-action (howm-iigrep-migemo))))
+
+(defun howm-list-migemo-action (roma)
+  (let* ((e-reg (howm-migemo-get-pattern roma "emacs"))
+         (g-reg (if howm-view-use-grep
+                    (howm-migemo-get-pattern roma "egrep")
+                  e-reg)))
+    (if (and e-reg g-reg)
+        (howm-search g-reg nil e-reg nil roma)
+      (message "No response from migemo-client."))))
 
 (defun howm-iigrep-migemo ()
   (let* ((converter (lambda (yomi) (howm-migemo-get-pattern yomi "egrep")))
@@ -518,7 +542,8 @@ key	binding
          (show-what (if (eq howm-iigrep-migemo-show-what 'inherit)
                         howm-iigrep-show-what
                       howm-iigrep-migemo-show-what)))
-    (iigrep-with-grep command-for-pattern show-what
+    (howm-with-iigrep command-for-pattern show-what
+                      #'howm-list-migemo-action
       (read-from-minibuffer "Search all (migemo): "))))
 
 (defun howm-migemo-get-pattern (roma type)