* elmo-imap4.el (elmo-imap4-search-internal-primitive): Remove

an invalid SPACE character ahead of `SEARCH' command.  Move
a valid SPACE character following `SEARCH' from conditional
`format' arguments to control-strings.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 536e310..41a2180 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -763,17 +763,17 @@ BUFFER must be a single-byte buffer."
        (elmo-imap4-send-command-wait session
                                     (format
                                      (if elmo-imap4-use-uid
-                                         "uid search%s%s%s %s"
-                                       " search%s%s%s %s")
+                                         "uid search %s%s%s %s"
+                                       "search %s%s%s %s")
                                      (if from-msgs
                                          (concat
-                                          (if elmo-imap4-use-uid " uid ")
+                                          (if elmo-imap4-use-uid "uid ")
                                           (cdr
                                            (car 
                                             (elmo-imap4-make-number-set-list
                                              from-msgs)))
                                           " ")
-                                       " ")
+                                       "")
                                      (if (eq (elmo-filter-type filter)
                                              'unmatch)
                                          "not " "")