Fix compiler warning

diff --git a/ChangeLog b/ChangeLog
index ab8dc8c71fba0981c0c3fe26e38b8a7a6e1bb56c..2478a6ea86d71227f0635393baa11fee9fe33c81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-06-02 20:25 +0200  Miroslav Lichvar  <mlichvar@redhat.com>  (d1d0481d1ca1)
+
+       * mutt_ssl_gnutls.c: Add support for GNUTLS_CERT_INSECURE_ALGORITHM
+       error code
+
+2009-06-02 20:11 +0200  Miroslav Lichvar  <mlichvar@redhat.com>  (0b13183e40e0)
+
+       * mutt_ssl_gnutls.c: Don't ignore certificate verification errors on
+       saved signer certs
+
+2009-06-02 10:18 -0700  René Clerc  <rene@clerc.nl>  (761bc678b23e)
+
+       * po/nl.po: Updated Dutch translation.
+
+2009-06-02 17:24 +0200  Rocco Rutte  <pdmef@gmx.net>  (8b2af5b64981)
+
+       * ChangeLog, buffy.c: Fix duplicate mailbox detection for remote
+       folders
+
 2009-06-02 17:05 +0200  Rocco Rutte  <pdmef@gmx.net>  (9ca14dff45c5)
 
        * smtp.c: Fix array size

diff --git a/pattern.c b/pattern.c
index 5581fb6734265c25b03a5ed94ad9e50bc46acd91..489a1d03529530299204e70bdf9d00ca1e0f13a0 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -1401,10 +1401,9 @@ int mutt_search_command (int cur, int op)
   progress_t progress;
   const char* msg = NULL;
 
-  if (!(LastSearch && *LastSearch) ||
-      (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE))
+  if (!*LastSearch || (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE))
   {
-    strfcpy (buf, LastSearch && *LastSearch ? LastSearch : "", sizeof (buf));
+    strfcpy (buf, *LastSearch ? LastSearch : "", sizeof (buf));
     if (mutt_get_field ((op == OP_SEARCH || op == OP_SEARCH_NEXT) ?
                        _("Search for: ") : _("Reverse search for: "),
                        buf, sizeof (buf),