patch-1.3.22.1.remove_warnings.awn.1, from Andrew W. Nosenko.

diff --git a/imap/imap.c b/imap/imap.c
index c4773ccb1e4d8f609121b9bcda86a6d75d9265bc..ede06b8f810fb6af3c53a688d2e5f46d8385f93c 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -357,7 +357,6 @@ IMAP_DATA* imap_conn_find (const ACCOUNT* account, int flags)
 int imap_open_connection (IMAP_DATA* idata)
 {
   char buf[LONG_STRING];
-  int rc;
 
   if (mutt_socket_open (idata->conn) < 0)
     return -1;
@@ -376,6 +375,8 @@ int imap_open_connection (IMAP_DATA* idata)
     /* Attempt STARTTLS if available and desired. */
     if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf)
     {
+      int rc;
+
       if ((rc = query_quadoption (OPT_SSLSTARTTLS,
         _("Secure connection with TLS?"))) == -1)
        goto err_close_conn;

diff --git a/init.h b/init.h
index 329de8d76354de7b9529d769e9f9c088eaafad94..20427ad6d6c97f13ec23d7b4eada105f3cf725b3 100644 (file)
--- a/init.h
+++ b/init.h
@@ -965,17 +965,17 @@ struct option_t MuttVars[] = {
   ** them.  If the variable is set, the message files will simply be
   ** deleted.
   */
-  { "mh_seq_flagged",  DT_STR, R_NONE, UL &MhUnseen, "flagged" },
+  { "mh_seq_flagged",  DT_STR, R_NONE, UL &MhUnseen, UL "flagged" },
   /*
   ** .pp
   ** The name of the MH sequence used for flagged messages.
   */
-  { "mh_seq_replied",  DT_STR, R_NONE, UL &MhUnseen, "replied" },
+  { "mh_seq_replied",  DT_STR, R_NONE, UL &MhUnseen, UL "replied" },
   /*
   ** .pp
   ** The name of the MH sequence used to tag replied messages.
   */
-  { "mh_seq_unseen",   DT_STR, R_NONE, UL &MhUnseen, "unseen" },
+  { "mh_seq_unseen",   DT_STR, R_NONE, UL &MhUnseen, UL "unseen" },
   /*
   ** .pp
   ** The name of the MH sequence used for unseen messages.