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 71cf6063c52312023e74b0cef6621dc2fa4b3c78..01c45db5d2c9f7e57581a41dd2c4db3b6e6c6bc8 100644 (file)
--- 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 0e21f5958e0143c068cc0005482efebffdba695b..f2bfa4d8647cb4c1c407f4c9f47ed8577e65696a 100644 (file)
--- 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...");