Merge changes from emacs-23 branch.

[gnu-emacs] / lisp / net / mairix.el

diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index b5fb92e5c6f5d7c70ce85383c1ed21cd747689d9..1974427c829fa86fd237a2b7a2bf9769cbed0042 100644 (file)
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -341,7 +341,7 @@ Currently there are 'threads and 'flags.")
 
 (defun mairix-search (search threads)
   "Call Mairix with SEARCH.
-If THREADS is t, also display whole threads of found
+If THREADS is non-nil, also display whole threads of found
 messages.  Results will be put into the default search file."
   (interactive
    (list
@@ -595,9 +595,7 @@ See %s for details" mairix-output-buffer)))
   "Send query from WIDGETS to mairix binary."
   (mairix-search
    (mairix-widget-make-query-from-widgets widgets)
-   (if (widget-value (cadr (assoc "Threads" widgets)))
-       t
-     -1))
+   (if (widget-value (cadr (assoc "Threads" widgets))) t))
   (kill-buffer mairix-customize-query-buffer))
 
 (defun mairix-widget-save-search (widgets)