# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1285424694 0
# Node ID 5e158658b471cfa00a43555cbd34b3707e1ef773
# Parent  04b79dd168dd02c7f36571d76e5491a9776cb91d
nnir.el (nnir-run-imap): Allow sending IMAP search patterns directly.

diff -r 04b79dd168dd -r 5e158658b471 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Sep 25 14:19:38 2010 +0000
+++ b/lisp/gnus/ChangeLog	Sat Sep 25 14:24:54 2010 +0000
@@ -1,3 +1,8 @@
+2010-09-25  Andrew Cohen  <cohen@andy.bu.edu>  (tiny change)
+
+	* nnir.el (nnir-run-imap): Allow sending IMAP search patterns
+	directly.
+
 2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.el (gnus-local-domain): Put gnus-local-domain back again, since
diff -r 04b79dd168dd -r 5e158658b471 lisp/gnus/nnir.el
--- a/lisp/gnus/nnir.el	Sat Sep 25 14:19:38 2010 +0000
+++ b/lisp/gnus/nnir.el	Sat Sep 25 14:24:54 2010 +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)