# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1263574911 -3600
# Node ID 5fc7644b0c5fdd9862ca260601540e6141507c46
# Parent  28877d9cc2e18c6581fdcc7247a3736dfe642a67# Parent  b86e6346b4a86b64411f9c51325bc9a1e83f5bca
Merge from trunk

diff -r 28877d9cc2e1 -r 5fc7644b0c5f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 15 18:01:04 2010 +0100
+++ b/lisp/ChangeLog	Fri Jan 15 18:01:51 2010 +0100
@@ -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 -r 28877d9cc2e1 -r 5fc7644b0c5f lisp/net/mairix.el
--- a/lisp/net/mairix.el	Fri Jan 15 18:01:04 2010 +0100
+++ b/lisp/net/mairix.el	Fri Jan 15 18:01:51 2010 +0100
@@ -341,7 +341,7 @@
 
 (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 @@
   "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)