Fix typo for $imap_pass

diff --git a/ChangeLog b/ChangeLog
index f6dd07a424ee9f716bbe2a2ac95571ead08ef862..4c21c0ba1fdc3e0341fea978f6749418f959d931 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2009-04-17 18:05 +0200  Rocco Rutte  <pdmef@gmx.net>  (7d44a83efcc6)
+
+       * pgp.c: Support the Charset: armor header for inline PGP. Closes
+       #3039.
+
+       The header is defined as optional by RfC4880.
+
+       This is based on patch-1.5.9.tamo.pgp_charsetchack.1. We only
+       support reading this header and, if present, recode the PGP output
+       from the given charset to $charset if we find it valid; otherwise
+       fall back to UTF-8. Certain clients make use of the header when
+       sending mail, so mutt should respect it because some messages are
+       otherwise unreadable.
+
+       The sending side is not touched, we unconditionally send UTF-8.
+
+2009-04-17 15:45 +0200  Michael Elkins  <me@mutt.org>  (61a0c67ed727)
+
+       * ChangeLog, sendlib.c: Make sure Recent-From: consults $realname.
+       Closes #1721.
+
 2009-04-17 15:37 +0200  Rocco Rutte  <pdmef@gmx.net>  (3a7ecc3f8aeb)
 
        * UPDATING, functions.h, pager.c: Make <set-flag> and <clear-flag>

diff --git a/init.h b/init.h
index cfb451f8d5e4b5d2a4e17c6fa059b6b87097fc90..b28dece0ef9597ae005007ae6bbebccb8993f8bd 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1123,7 +1123,7 @@ struct option_t MuttVars[] = {
   /*
   ** .pp
   ** Specifies the password for your IMAP account.  If \fIunset\fP, Mutt will
-  ** prompt you for your password when you invoke the \fC$<fetch-mail>\fP function
+  ** prompt you for your password when you invoke the \fC<imap-fetch-mail>\fP function
   ** or try to open an IMAP folder.
   ** .pp
   ** \fBWarning\fP: you should only use this option when you are on a