Including Vikas' search code for the "attach message" menu.

1 files changed, 13 insertions, 5 deletions

diff --git a/menu.c b/menu.c
index f582a1eb..474d4382 100644
--- a/menu.c
+++ b/menu.c
@@ -574,14 +574,21 @@ void mutt_menuDestroy (MUTTMENU **p)
 static int menu_search (MUTTMENU *menu, int op)
 {
   int r;
-  int searchDir = (menu->searchDir == M_SEARCH_UP) ? -1 : 1;
+  int searchDir;
   regex_t re;
   char buf[SHORT_STRING];
 
+  /* Need to search the folder using the pattern matching language,
+   * not plain regexps. mutt_search_command() does just this */
+  if (menu->search == (int (*)(MUTTMENU *, regex_t *, int)) -1 )
+    return mutt_search_command (menu->data, menu->current, op);
+
   if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE)
   {
     strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (buf));
-    if (mutt_get_field ("Search for: ", buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
+    if (mutt_get_field ((op == OP_SEARCH) ? "Search for: " : 
+                                            "Reverse search for: ",
+			 buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
       return (-1);
     safe_free ((void **) &menu->searchBuf);
     menu->searchBuf = safe_strdup (buf);
@@ -594,11 +601,12 @@ static int menu_search (MUTTMENU *menu, int op)
       mutt_error ("No search pattern.");
       return (-1);
     }
-
-    if (op == OP_SEARCH_OPPOSITE)
-      searchDir = -searchDir;
   }
 
+  searchDir = (menu->searchDir == M_SEARCH_UP) ? -1 : 1;
+  if (op == OP_SEARCH_OPPOSITE)
+    searchDir = -searchDir;
+
   if ((r = REGCOMP (&re, menu->searchBuf, REG_NOSUB | mutt_which_case (menu->searchBuf))) != 0)
   {
     regerror (r, &re, buf, sizeof (buf));