Fix IMAP keepalive if $imap_keepalive >= $timeout

diff --git a/ChangeLog b/ChangeLog
index acd482a048db015184be238ca894002c38644a4f..784e779afc2dcbec4a0c5bcd1f1b4a0d4dd2eed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-01 18:23 +0200  Rocco Rutte  <pdmef@gmx.net>  (17adea9cdff6)
+
+       * UPDATING: Add note about locale-safe hcaches to UPDATING as it's a
+       user-visible change
+
+2008-08-31 23:36 +0200  Rocco Rutte  <pdmef@gmx.net>  (b6d07a662c7f)
+
+       * ChangeLog, init.h, pager.c: Fix pager to respect $wrap_search
+
 2008-08-31 23:28 +0200  Rocco Rutte  <pdmef@gmx.net>  (f4b10e6b415c)
 
        * doc/chunk.xsl, doc/html.xsl: Backout [e5610347fb3f] for further

diff --git a/keymap.c b/keymap.c
index 5de29954e6c8bd87e3018515648022ce10902db0..dbdde0875750f46eb972381ab07d732b09c62af1 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -390,16 +390,22 @@ int km_dokey (int menu)
     i = Timeout > 0 ? Timeout : 60;
 #ifdef USE_IMAP
     /* keepalive may need to run more frequently than Timeout allows */
-    while (ImapKeepalive && ImapKeepalive < i)
+    if (ImapKeepalive)
     {
-      timeout (ImapKeepalive * 1000);
-      tmp = mutt_getch ();
-      timeout (-1);
-      if (tmp.ch != -2)
-        /* something other than timeout */
-        goto gotkey;
-      i -= ImapKeepalive;
-      imap_keepalive ();
+      if (ImapKeepalive >= i)
+       imap_keepalive ();
+      else
+       while (ImapKeepalive && ImapKeepalive < i)
+       {
+         timeout (ImapKeepalive * 1000);
+         tmp = mutt_getch ();
+         timeout (-1);
+         if (tmp.ch != -2)
+           /* something other than timeout */
+           goto gotkey;
+         i -= ImapKeepalive;
+         imap_keepalive ();
+       }
     }
 #endif