* net/mairix.el (mairix-widget-send-query): Send -1 instead of nil

to mairix-search to suppress threading (Bug#5342).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0cdf71dab459a7e4b17b6c4b30a2f0d83a550c7..9e08889ba616794758033dc8f38329dec3531c22 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-15   David Abrahams  <dave@boostpro.com>  (tiny change)
+
+       * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil
+       to mairix-search to suppress threading (Bug#5342).
+
 2010-01-15  Kenichi Handa  <handa@m17n.org>
 
        * international/mule-cmds.el (canonicalize-coding-system-name):

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)