[Emacs-diffs] /srv/bzr/emacs/trunk r101612: nnir.el (nnir-run-imap): Allow sending IMAP search patterns directly.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101612
author: Andrew Cohen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 14:24:54 +0000
message:
  nnir.el (nnir-run-imap): Allow sending IMAP search patterns directly.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-25 14:19:38 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-25 14:24:54 +0000
@@ -1,3 +1,8 @@
+2010-09-25  Andrew Cohen  <address@hidden>  (tiny change)
+
+       * nnir.el (nnir-run-imap): Allow sending IMAP search patterns
+       directly.
+
 2010-09-25  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.el (gnus-local-domain): Put gnus-local-domain back again, since

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2010-09-24 00:38:10 +0000
+++ b/lisp/gnus/nnir.el 2010-09-25 14:24:54 +0000
@@ -345,14 +345,16 @@
 (gnus-declare-backend "nnir" 'mail)
 
 (defvar nnir-imap-search-field "TEXT"
-  "The IMAP search item when doing an nnir search")
+  "The IMAP search item when doing an nnir search. To use raw
+  imap queries by default set this to \"\"")
 
 (defvar nnir-imap-search-arguments
   '(("Whole message" . "TEXT")
     ("Subject" . "SUBJECT")
     ("To" . "TO")
     ("From" . "FROM")
-    (nil . "HEADER \"%s\""))
+    ("Head" . "HEADER \"%s\"")
+    (nil . ""))
   "Mapping from user readable strings to IMAP search items for use in nnir")
 
 (defvar nnir-imap-search-argument-history ()
@@ -981,8 +983,11 @@
              (message "Searching %s..." group)
              (let ((arts 0)
                    (result
-                    (nnimap-command "UID SEARCH  %s" 
-                                    (nnir-imap-make-query criteria qstring))))
+                    (nnimap-command "UID SEARCH  %s"
+                                    (if (string= criteria "")
+                                        qstring
+                                      (nnir-imap-make-query criteria qstring)
+                                      ))))
                (mapc
                 (lambda (artnum)
                   (push (vector group artnum 1) artlist)