From 03787a6e3a544d2afafd0df5ba3408f6b6c1fdf2 Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Sun, 3 Feb 2002 14:32:44 +0000
Subject: [PATCH] * lisp/nnir.el (nnir-imap-default-charset): New user option.
 (nnir-run-imap): Supply the charset of a search criteria.

---
 lisp/nnir.el |   27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 6d347d5..b188fbb 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -461,6 +461,11 @@ that it is for EWS, not Glimpse."
   :type '(regexp)
   :group 'nnir)
 
+(defcustom nnir-imap-default-charset nil
+  "*Name of the charset of the strings that appear in the search criteria."
+  :type '(choice (const nil) string)
+  :group 'nnir)
+
 ;; Swish++.  Next three variables Copyright (C) 2000, 2001 Christoph
 ;; Conrad <christoph.conrad@gmx.de>.
 ;; Swish++ home page: http://homepage.mac.com/pauljlucas/software/swish/
@@ -968,6 +973,7 @@ pairs (also vectors, actually)."
 (defun nnir-run-imap (query &optional group)
   (require 'imap)
   (require 'nnimap)
+  (require 'mm-util)
   (unless group
     (error "Must specify groups for IMAP searching."))
   (save-excursion
@@ -981,13 +987,30 @@ pairs (also vectors, actually)."
 	    (setq buf nnimap-server-buffer) ;; xxx
 	    (message "Searching %s..." group)
             (let ((arts 0)
-                  (mbx (gnus-group-real-name group)))
+                  (mbx (gnus-group-real-name group))
+		  (multibyte-p (mm-multibyte-p))
+		  charset coding-system)
               (when (imap-mailbox-select mbx nil buf)
+		(with-temp-buffer
+		  (if multibyte-p
+		      (mm-enable-multibyte))
+		  (insert qstring)
+		  (setq charset (car (mm-find-mime-charset-region
+				      (point-min)(point-max)))))
+		(unless charset
+		  (setq charset nnir-imap-default-charset))
                 (mapcar
                  (lambda (artnum)
                    (push (vector mbx artnum 1) artlist)
                    (setq arts (1+ arts)))
-                 (imap-search (concat "TEXT \"" qstring "\"") buf))
+		 (if (and (not (eq charset 'us-ascii))
+			  (setq coding-system (mm-charset-to-coding-system
+					       charset)))
+		     (imap-search
+		      (concat "CHARSET " (symbol-name charset) " TEXT \""
+			      (mm-encode-coding-string qstring coding-system)
+			      "\"") buf)
+		   (imap-search (concat "TEXT \"" qstring "\"") buf)))
                 (message "Searching %s... %d matches" mbx arts)))
             (message "Searching %s...done" group))
         (quit nil))
-- 
1.7.10.4