From: Rocco Rutte <pdmef@gmx.net>
Date: Fri, 29 May 2009 14:21:15 +0000 (+0200)
Subject: Fix pager search prompt for reverse search
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1048ecc019d7278a28250ba3206806a55b488cdd;p=neomutt

Fix pager search prompt for reverse search

When doing a reverse search for the first time after switching to the
pager, SearchBack is always 0 and thus gave the wrong prompt, change to
using op directly. While I'm at it, unify search prompts.
---

diff --git a/ChangeLog b/ChangeLog
index ab235968e..d7a6c45d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-05-29 13:27 +0200  Rocco Rutte  <pdmef@gmx.net>  (f1a1e50c375d)
+
+	* doc/manual.xml.head: Manual: Fix markup of environment variables
+
+2009-05-28 16:37 +0200  Rocco Rutte  <pdmef@gmx.net>  (f260f5836284)
+
+	* ChangeLog, smtp.c: SMTP: don't interactively authenticate without a
+	password in batch/mailx mode
+
+	Otherwise, if we don't have a password and curses is not running,
+	the SASL authentication callback will crash mutt. We now abort if
+	the password wasn't given in $smtp_url.
+
 2009-05-28 15:20 +0200  Rocco Rutte  <pdmef@gmx.net>  (84a56dcb0572)
 
 	* doc/mutt.css: Manual: vertical-align table cells at the top
diff --git a/pager.c b/pager.c
index 8443cd75d..e67af057e 100644
--- a/pager.c
+++ b/pager.c
@@ -2089,9 +2089,10 @@ search_next:
       case OP_SEARCH:
       case OP_SEARCH_REVERSE:
         strfcpy (buffer, searchbuf, sizeof (buffer));
-	if (mutt_get_field ((SearchBack ? _("Reverse search: ") :
-			  _("Search: ")), buffer, sizeof (buffer),
-			  M_CLEAR) != 0)
+	if (mutt_get_field ((ch == OP_SEARCH || ch == OP_SEARCH_NEXT) ?
+			    _("Search for: ") : _("Reverse search for: "),
+			    buffer, sizeof (buffer),
+			    M_CLEAR) != 0)
 	  break;
 
 	if (!strcmp (buffer, searchbuf))