# HG changeset patch
# User Bill Wohler <wohler@newt.com>
# Date 1211162072 0
# Node ID 8b5aa7cf7c717a2a8d8be7f47562c80f98f677a6
# Parent  e3632d427a217cac4e743347f969b8584a3efc47
(mh-mairix-regexp-builder): Add additional items to search string to
support org-mode (closes SF #1965704).

diff -r e3632d427a21 -r 8b5aa7cf7c71 lisp/mh-e/mh-search.el
--- a/lisp/mh-e/mh-search.el	Mon May 19 01:54:10 2008 +0000
+++ b/lisp/mh-e/mh-search.el	Mon May 19 01:54:32 2008 +0000
@@ -1088,8 +1088,16 @@
           (cond ((eq (car pair) 'to) "t:")
                 ((eq (car pair) 'from) "f:")
                 ((eq (car pair) 'cc) "c:")
+                ((eq (car pair) 'to-or-cc) "tc:")
+                ((eq (car pair) 'address) "a:")
                 ((eq (car pair) 'subject) "s:")
+                ((eq (car pair) 'subject-or-body) "bs:")
                 ((eq (car pair) 'date) "d:")
+                ((eq (car pair) 'message-id) "m:")
+                ((eq (car pair) 'message-body) "b:")
+                ((eq (car pair) 'message-size) "z:")
+                ((eq (car pair) 'message-attachment-name) "n:")
+                ((eq (car pair) 'message-flags) "F:")
                 (t ""))
           (let ((sop (cdr (mh-mairix-convert-to-sop* (cdr pair))))
                 (final ""))