X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mymail.git;a=blobdiff_plain;f=mymail-vm.el;h=840bd93026187344c4ce623ff506b8c72497f153;hp=07ed864273384c2fbf04eeebd219c355ef54f643;hb=7b9e0f6566b6a597dc83f79dd405e0ddd520a7ff;hpb=0ac726a97e3c958596f534832b7676e7b11410a3

diff --git a/mymail-vm.el b/mymail-vm.el
index 07ed864..840bd93 100644
--- a/mymail-vm.el
+++ b/mymail-vm.el
@@ -16,37 +16,71 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with mymail.  If not, see <http://www.gnu.org/licenses/>.
 
-(add-to-list 'recentf-exclude "/tmp/mymail-vm-.*\.mbox")
+;; You may want to add
+;;
+;; (add-to-list 'recentf-exclude "/tmp/mymail-vm-.*\.mbox")
+;;
+;; to your .emacs
+
+(defgroup mymail ()
+  "Command to visit a folder build on-the-fly with mymail"
+  :version "0.9.5")
 
-(defcustom mymail/default-search-request ""
-  "Default request to add to any search"
-  :type 'string)
+(defcustom mymail/default-additional-search-requests ""
+  "Comma-separated list of search requests to add to any search"
+  :type 'string
+  :group 'mymail)
+
+(defcustom mymail/default-search-request nil
+  "Default request to use in place of the empty search"
+  :type 'string
+  :group 'mymail)
 
 (defun mymail/vm-visit-folder (param)
+  "Read a comma-separated list of search requests for mymail,
+create a temporary mbox with the resulting mails, and open it in
+vm with `vm-visit-folder'.
+
+If the request string is empty, use
+`mymail/default-search-request' instead.
+
+The string `mymail/default-additional-search-requests' is automatically
+concatenated to the provided request, except if the request is
+prefaced with \\."
   (interactive
-   (list (read-string "mymail: " nil 'mymail-vm-history)))
+   (list (read-string "mymail-vm: " nil 'mymail-vm-history)))
+
+  (if (string= param "")
+      (if mymail/default-search-request
+          (setq param mymail/default-search-request)
+        (error "mymail error: empty search")))
 
   (let ((n 1)
         (mbox-name nil)
+
         (search-args
+
          (apply 'nconc
           (mapcar
            (lambda (searche-request)
              (if (not (string= searche-request ""))
-                 (list "-s" searche-request)))
-           (split-string (concat param "," mymail/default-search-request) ",")
-           ))))
+                 (list "--search" searche-request)))
+           (if (string= (substring param 0 1) "\\")
+               (split-string (substring param 1 nil) ",")
+             (split-string (concat param "," mymail/default-additional-search-requests) ","))
+           )))
+
+        )
 
     (while (get-file-buffer (setq mbox-name (format "/tmp/mymail-vm-%d.mbox" n)))
       (setq n (+ n 1)))
 
     (if (= (apply 'call-process
-                  (nconc `("mymail" nil nil nil "--output" ,mbox-name)
-                          search-args))
-            0)
+                  (nconc (list "mymail" nil nil nil
+                               "--output" mbox-name
+                               "--default-search" "p")
+                         search-args))
+           0)
         (vm-visit-folder mbox-name t)
       (message "mymail failed"))
-
-    ;; (shell-command (concat "mymail --quiet --output " mbox-name " " args))
-    ;; (vm-visit-folder mbox-name t)
   ))