From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 24 Nov 2005 12:50:27 +0000 (+0000)
Subject: mutt/2142 suggests that the change from pattern.c,3.14 -> 3.15
X-Git-Tag: mutt-1-5-12-rel~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f876319fbdf5fb9d99b312f04e42a8cf9eee5fae;p=mutt

mutt/2142 suggests that the change from pattern.c,3.14 -> 3.15
causes inconsistency and confusion.  Reverting the change;
adding a helpful message to the status line.
---

diff --git a/curs_main.c b/curs_main.c
index 71cf6063..01c45db5 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -868,6 +868,8 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 	    mutt_draw_tree (Context);
 	  menu->redraw = REDRAW_FULL;
 	}
+        if (Context->pattern)
+	  mutt_message _("To view all messages, limit to \"all\".");
 	break;	  
 
       case OP_QUIT:
diff --git a/pattern.c b/pattern.c
index 0e21f595..f2bfa4d8 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1202,15 +1202,8 @@ int mutt_pattern_func (int op, char *prompt)
   int i;
 
   strfcpy (buf, NONULL (Context->pattern), sizeof (buf));
-  if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0)
+  if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0])
     return (-1);
-  if (!buf[0])
-  {
-    if (op == M_LIMIT)
-      strfcpy (buf, "~A", sizeof(buf));
-    else
-      return -1;
-  }
 
   mutt_message _("Compiling search pattern...");