pdmef.cache.24: Generalise IMAP body caching and add POP support.

$imap_cachedir is now a synonym for $message_cachedir, and should
be dropped soon since it hasn't been in an official release.

1 files changed, 10 insertions, 5 deletions

diff --git a/init.h b/init.h
index d1a9bc7e..12a521d5 100644
--- a/init.h
+++ b/init.h
@@ -822,12 +822,8 @@ struct option_t MuttVars[] = {
   ** the previous methods are unavailable. If a method is available but
   ** authentication fails, mutt will not connect to the IMAP server.
   */
-  { "imap_cachedir", DT_PATH, R_NONE, UL &ImapCachedir, 0 },
+  { "imap_cachedir", DT_SYN, R_NONE, UL "message_cachedir", 0 },
   /*
-   ** .pp
-   ** Set this to a directory and mutt will cache copies of messages from
-   ** your IMAP servers here. You are free to remove entries at any time
-   ** if space becomes an issue.
    */
   { "imap_check_subscribed",  DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, 0 },
   /*
@@ -1281,6 +1277,15 @@ struct option_t MuttVars[] = {
   ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
   ** a ``$mbox-hook'' command.
   */
+#if defined(USE_IMAP) || defined(USE_POP)
+  { "message_cachedir",	DT_PATH,	R_NONE,	UL &MessageCachedir, 0 },
+  /*
+  ** .pp
+  ** Set this to a directory and mutt will cache copies of messages from
+  ** your IMAP and POP servers here. You are free to remove entries at any time
+  ** if space becomes an issue.
+  */
+#endif
   { "message_format",	DT_STR,	 R_NONE, UL &MsgFmt, UL "%s" },
   /*
   ** .pp