Mercurial > emacs
changeset 106856:5fc7644b0c5f
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 15 Jan 2010 18:01:51 +0100 |
| parents | 28877d9cc2e1 (current diff) b86e6346b4a8 (diff) |
| children | f12233437424 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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)