automatic post-release commit for mutt-1.5.24mutt-1-5-24-rel

31 files changed, 17074 insertions, 12730 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c51f485..97f2e192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1387 @@
+2015-08-30 10:21 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (d9b1c4b6662f)
+
+	* po/eo.po: Partially updated Esperanto translation.
+
+2015-08-30 10:18 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (b9864644b6a2)
+
+	* commands.c: Minor translation fixes.
+
+	This makes two equivalent translation messages the exact same so
+	they only need to be translated once.
+
+	It also adds a missing translation marker (for the same string).
+
+	This same string is used in recvcmd.c so does not generate a new
+	translation string.
+
+2015-08-30 10:08 -0700  Kevin McCarthy  <kevin@8t8.us>  (934fbd272ce6)
+
+	* UPDATING: Set release date. Minor fixes to release notes.
+
+2015-08-29 12:51 -0700  Ivan Vilata i Balaguer  <ivan@selidor.net>  (faa85ed8a7c9)
+
+	* po/ca.po: Updated Catalan translation.
+
+2015-08-29 12:40 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (14a2ad40e954)
+
+	* po/nl.po: Updated Dutch translation.
+
+2015-08-29 07:40 -0700  Benno Schulenberg  <i18n@benno.vertaalt.nl>  (0d346dc8dccb)
+
+	* smime.c: Minor translation fix.
+
+	This makes two equivalent translation messages the exact same so
+	they only need to be translated once.
+
+2015-08-28 07:35 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (e33ba8f72a40)
+
+	* po/ja.po: Updated Japanese translation.
+
+2015-08-20 11:18 -0700  Vsevolod Volkov  <vvv@mutt.org.ua>  (b3c095648df6)
+
+	* po/ru.po: Updated Russian translation.
+
+2015-08-19 09:41 -0700  Petr Pisar  <petr.pisar@atlas.cz>  (83760f05bb46)
+
+	* po/cs.po: Updated Czech translation
+
+2015-08-17 14:51 -0700  Kevin McCarthy  <kevin@8t8.us>  (c0180991c352)
+
+	* configure.ac: Add idn to MUTTLIBS instead of LIBS (see #3638)
+
+	Currently, -lidn is included while linking all the mutt binaries.
+	Add it to MUTTLIBS instead so it's only used for the mutt linking.
+
+	Also, add $LIBICONV to $LIBS before checking for some of the idna
+	functions. On some sytems, there are apparently issues when using
+	static linking. (Thanks to grarpamp for reporting).
+
+2015-08-17 12:31 -0700  Kevin McCarthy  <kevin@8t8.us>  (356443232291)
+
+	* muttlib.c, protos.h: Change mutt_adv_mktemp to call mutt_mktemp
+	instead of mktemp. (see #3638).
+
+	mutt_mktemp is currently called in 95% of the cases in mutt, and is
+	already our "own rolled" version of mktemp. The "insecure mktemp
+	warning" discussion keeps coming up, so instead add prefix and
+	suffix functionality to mutt_mktemp() and call that.
+
+	All other uses of Tempdir in the mutt source did not call
+	mutt_expand_path() first, so remove that from mutt_adv_mktemp().
+
+2015-08-17 12:26 -0700  Kevin McCarthy  <kevin@8t8.us>  (8b2fe6a4db79)
+
+	* configure.ac: Enable C99 mode for compiler. (See #3638).
+
+	This is already the default for clang (FreeBSD) so shouldn't cause
+	any issues.
+
+	Enabling this will increase the allowed static string length and
+	remove the Copyright length warning.
+
+2015-08-11 11:20 -0700  Kevin McCarthy  <kevin@8t8.us>  (55ea6e829b46)
+
+	* Makefile.am: Compile txt2c using automake rules.
+
+	The compilation rule used $< which isn't portable for ordinary make
+	rules.
+
+2015-08-11 11:20 -0700  David Champion  <dgc@bikeshed.us>  (eb4aaf4581ac)
+
+	* txt2c.sh: Fix txt2c.sh sed invocations to use posix syntax.
+
+2015-08-07 03:38 +0200  Vincent Lefevre  <vincent@vinc17.net>  (711708700602)
+
+	* po/fr.po: Updated French translation.
+
+2015-07-29 09:26 -0700  Kevin McCarthy  <kevin@8t8.us>  (34ca1c5fdd45)
+
+	* doc/manual.xml.head: Minor documentation fix.
+
+	In one place, the documentation mentioned 'alternative-order'
+	instead of 'alternative_order'.
+
+2015-07-29 09:07 -0700  Kevin McCarthy  <kevin@8t8.us>  (75e398daa94c)
+
+	* doc/manual.xml.head, hook.c: Add error handling for ^ and other
+	empty mailbox shortcuts.
+
+	(closes #2402) (closes #3735)
+
+	Explicitly mention the ^ example in the documentation added in
+	6d733cab6b45.
+
+	Add an error message for ^ when CurrentFolder is not set. Add checks
+	for other mailbox shortcuts that expand to the empty string. This
+	could happen if the @alias shortcut was accidentally used, or the
+	value referenced by a shortcut isn't set yet.
+
+2015-07-27 14:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (6d733cab6b45)
+
+	* doc/manual.xml.head: Add "Mailbox Matching in Hooks" section to
+	manual.
+
+	Folder-hook and mbox-hook perform mailbox shortcut expansion on the
+	regexp parameter. Add a section to the manual to give examples and
+	make the behavior clearer.
+
+2015-07-26 14:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (21a08f9abc80)
+
+	* crypt-gpgme.c, crypt.c, handler.c, mutt_crypt.h, pgp.c,
+	recvattach.c: Handle malformed ms-exchange pgp-encrypted block.
+	(closes #3742)
+
+	In certain circumstances, Exchange corrupts a multipart/encrypted
+	block into: <multipart/mixed> <text/plain> <application /pgp-
+	encrypted> [BASE64-encoded] <application/octet-stream>
+	[BASE64-encoded]
+
+	This patch pulls the full detection of valid/invalid multiparts into
+	mutt_body_handler(). It extracts a run_decode_and_handler()
+	function, which is reused by new intermediate handlers to decode the
+	application/octet-stream part before passing it directly to
+	crypt_pgp_encrypted_handler. These intermediate handlers then check
+	and set any GOODSIG flags back into the parent part.
+
+	This change may result in less error messages for invalid
+	multipart/encrypted parts. Instead, mutt will default to the
+	multipart_handler if it isn't fully "correct".
+
+	Viewing attachments uses crypt_pgp_decrypt_mime() which bypasses the
+	handler mechanism. Add decoding to the decrypt_mime() functions for
+	pgp and gpgme.
+
+	Thanks to Vincent Brillault for his analysis and initial patch.
+
+2015-07-18 18:40 +0200  Martin Sandsmark  <martin@sandsmark.ninja>  (e40e3e0391ea)
+
+	* UPDATING, buffy.c, init.h, mutt.h: Add support for checking cur/ in
+	Maildir for unread mails in buffy.
+
+	Also skip messages with the S flag when checking for unread mails.
+
+2015-07-24 13:36 -0700  Kevin McCarthy  <kevin@8t8.us>  (fdafc56a854f)
+
+	* doc/Makefile.am: Set AUTOMAKE_OPTIONS in doc/Makefile.am. (closes
+	#3766)
+
+	Add the "foreign" option to silence warnings generated by
+	flymake.am.
+
+2015-07-24 13:15 -0700  Kevin McCarthy  <kevin@8t8.us>  (cbae8642cb3d)
+
+	* UPDATING: Update the UPDATING file with changes since 1.5.23.
+
+2015-07-23 14:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (8c16206f50a1)
+
+	* hcache.c, help.c, imap/util.c, protos.h, sendlib.c: Fix compiler
+	type warnings. (closes #3765)
+
+	The output of mutt_local_tz() was being passed to abs(). Technically
+	the return type is time_t, but it represents a small value: the
+	timezone offset in seconds. Add a safe explicit cast to int.
+
+	Change the txt parameter of mutt_make_help() to type const char *.
+	Typically all calls run the txt parameter through _(), which accepts
+	const char * and returns a char *. However, if NLS is not enabled,
+	_() is a noop, simply returning the parameter itself. In
+	mutt_compile_help(), items[i].name is const char *, so it will
+	generate a warning when passed as the txt parameter of
+	mutt_make_help().
+
+	On some systems, e.g. OS X, snprintf is defined as a macro. One call
+	in hcache.c was embedding directives inside the snprintf call. This
+	is apparently undefined behavior, so duplicate the call instead.
+
+2015-07-22 19:23 -0700  Kevin McCarthy  <kevin@8t8.us>  (c60fed102d79)
+
+	* imap/message.c, keymap.c, pop_lib.c: Fix a few small compiler
+	warnings. (See #3638)
+
+	In certain configurations, unused variables and labels were causing
+	warnings.
+
+	Add a missing "#include <netinet/in.h>" to pop_lib.c.
+
+2015-07-21 12:41 -0700  Kevin McCarthy  <kevin@8t8.us>  (704e0622cc67)
+
+	* imap/imap.c: merge stable
+
+2015-07-21 12:34 -0700  Kevin McCarthy  <kevin@8t8.us>  (e5fe2f80e797)
+
+	* imap/imap.c: Imap: Fix flag caching after sync.
+
+	The flags cached in IMAP_HEADER_DATA were not updated to match the
+	HEADER flags after a sync. This means if a flag were toggled and
+	synced twice, the second sync was not sending the flag update.
+
+	Thanks to Noah Misch for the patch.
+
+2015-07-19 15:55 -0700  Kevin McCarthy  <kevin@8t8.us>  (100835c4a8ac)
+
+	* init.h: Add note about gpg fixed-list-mode. (closes #3763).
+
+	Thanks to Gregor Zattler for the original patch.
+
+2015-07-11 14:36 -0700  Kevin McCarthy  <kevin@8t8.us>  (2ca89bed6448)
+
+	* main.c: Fix batch mode lockup. (closes #3761) (closes #3760)
+
+	The new TS capability check was also running when curses wasn't
+	initialized. Move check inside the !OPTNOCURSES block.
+
+2015-07-09 14:50 -0700  Kevin McCarthy  <kevin@8t8.us>  (7e91a8855dc3)
+
+	* Makefile.am, doc/Makefile.am, imap/Makefile.am: Use $(VAR) instead
+	of @VAR@ in Makefile.am files. (closes #3664)
+
+	The @VAR@ form is not overridable, such as the case for #3664 where
+	the reporter wanted to override DOTLOCK_GROUP.
+
+	It's doubtful targets need to be overriden, but it makes sense to be
+	consistent in the usage of automake substituted variables unless
+	there is a particular reason/bug to work around.
+
+2015-07-05 13:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (79cd2f34961d)
+
+	* crypt-gpgme.c: Remove 'hit enter' prompt for GPGME initialization
+	errors.
+
+	Older GPGMEs are missing CMS (S/MIME) support. Don't force the poor
+	users to hit enter every time they start mutt.
+
+2015-07-02 11:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (39422ec14f60)
+
+	* .hgignore, mkinstalldirs: Remove the automake mkinstalldirs script.
+
+	Add to .hgignore so it doesn't accidentally get added again.
+
+2015-07-02 11:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (97ef326274e7)
+
+	* Makefile.am, configure.ac, contrib/Makefile.am, doc/Makefile.am,
+	intl/Makefile.in, m4/gettext.m4, po/Makefile.in.in: Convert from
+	using mkinstalldirs to $(MKDIR_P).
+
+	The automake mkinstalldirs script is now deprecated. "install-sh -d"
+	can be used in place. Configure.ac already includes AC_PROG_INSTALL,
+	which will ensure install-sh is bundled. Add AC_PROG_MKDIR_P, which
+	will set $(MKDIR_P) to either a thread-safe "mkdir -p" or will fall
+	back to using install-sh.
+
+2015-07-02 11:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (67d945e38074)
+
+	* build-release: Fix build-release to always update automake tools.
+	(closes #3671)
+
+	1.5.22 and 1.5.23 include a version of "missing" older than the
+	version of automake/aclocal used to generate configure.
+
+	Fix the build-release script to always copy and force update of the
+	automake tools.
+
+2015-06-29 14:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (9802a6172edf)
+
+	* doc/manual.xml.head: Add note to manual clarifying push/exec and
+	folder-hook order.
+
+	Folder-hooks are executed in the order declared. However, push/exec
+	commands will simply prepend to the keyboard buffer. If there are
+	multiple push/exec commands, each will prepend to the earlier one.
+	The result is that they will end up being "run" in reverse order
+	once keyboard buffer processing starts.
+
+2015-06-26 12:23 -0700  Kevin McCarthy  <kevin@8t8.us>  (3bbb1f569eb1)
+
+	* imap/auth_sasl.c, imap/imap.c: Fix IMAP segfault due to NULL capstr.
+
+	After a failed login, the connection is left open but capstr is
+	freed. If a second login attempt is made, imap_auth_sasl was trying
+	to strstr using the NULL capstr.
+
+	Add a NONULL around the capstr parameter to strstr. Change
+	imap_conn_find() to keep the capstr around until a successful
+	authentication occurs.
+
+2015-06-26 11:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (b4be5796a458)
+
+	* crypt-gpgme.c, pgp.c, smime.c: Add comment about "(f)orget it"
+	choice in pgp/smime send menus.
+
+2015-06-26 12:28 +0200  Vincent Lefevre  <vincent@vinc17.net>  (b640b23e64a8)
+
+	* po/fr.po: Updated French translation.
+
+2015-06-07 13:59 -0700  Kevin McCarthy  <kevin@8t8.us>  (17a4f92e4a95)
+
+	* smime.c, smime.h: Rewrite S/MIME key searching. Add purpose
+	checking.
+
+	Model the smime.c searching off of classic pgp searching. Create
+	smime_get_key_by_hash()/addr()/str() functions that use a single
+	smime_get_candidates() function to search the index.
+
+	Use the new smime_keys generated purpose flag in the index to filter
+	by KEYFLAG_CANENCRYPT and KEYFLAG_CANSIGN. Old style indices fall
+	back to all-inclusive behavior.
+
+2015-06-07 13:59 -0700  Kevin McCarthy  <kevin@8t8.us>  (106914bc9406)
+
+	* smime_keys.pl: smime_keys: Add refresh command.
+
+	Refresh verifies the trust of each certificate and adds the purpose
+	flag if it is missing. It pushes those values to the private keys'
+	index file too.
+
+2015-06-07 13:59 -0700  Kevin McCarthy  <kevin@8t8.us>  (aabd030b25cb)
+
+	* smime_keys.pl: smime_keys: Add purpose flag to index.
+
+	A subsequent patch will change smime.c to use the purpose to filter
+	certs and keys that can't be used for signing or encryption.
+
+	Issuer, trust, and purpose flags were also added to the keys index
+	file, to keep parsing simpler in smime_keys as well as smime.c. The
+	trust and purpose are derived from the cert. Issuer is set to '?' as
+	this should never be needed for keys.
+
+2015-05-25 10:59 -0700  Kevin McCarthy  <kevin@8t8.us>  (0255b37be491)
+
+	* smime_keys.pl: smime_keys: Handle certificate chains in add_cert.
+	(closes #3339) (closes #3559)
+
+	Find all chains in the certificate provided. For each chain create a
+	separate leaf and intermediate certificate file. Because Mutt
+	controls the label prompt, use a single label for all chains.
+
+	Also, loosen up cert file parsing to allow attributes even if they
+	aren't delimited by a "Bag Attributes" header.
+
+	Thanks to David J. Weller-Fahy for his testing and feedback!
+
+2015-05-18 13:27 -0700  Kevin McCarthy  <kevin@8t8.us>  (577987ca2d02)
+
+	* smime_keys.pl: smime_keys: Convert openssl execution to use
+	open("-|",...). (see #3575) (see #2456)
+
+	This does a fork/exec, bypassing the shell, and so handles spaces,
+	quotes, and other shell-characters problems better than the simple
+	fix in changeset:c66a6bd5d0d5
+
+	This also fixes the "verify with crl" bug in #2456: the grep is now
+	done in perl.
+
+	Thank you Vincent Lefevre for your review and feedback!
+
+2015-05-18 03:25 +0200  Vincent Lefevre  <vincent@vinc17.net>  (82d43abf2a37)
+
+	* po/fr.po: Updated French translation (related to PGP & S/MIME, with
+	corrections).
+
+2015-05-15 14:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (c66a6bd5d0d5)
+
+	* smime_keys.pl: smime_keys: quote filenames. (closes #3575) (see
+	#2456)
+
+	Wrap the various filename parameters in single quotes in case there
+	are spaces in the filename.
+
+2015-05-15 10:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (babc30377614)
+
+	* smime_keys.pl: Start cleaning up and fixing smime_keys.pl (closes
+	#3324) (see #2456)
+
+	* Convert to using File::Temp (#3324). This was also suggested at
+	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775199
+
+	* Use File::Temp for add_p12 temp file. (#2456)
+
+	* Make the query_label() method a bit more robust with empty
+	strings, ctrl-d, and leading spaces.
+
+	* Clean up openssl_do_verify() logic. Mark cert as invalid rather
+	that die'ing if an openssl verify command fails.
+
+	* General cleanup:
+	  - Clearly separate op handler, certificate management, and helper
+	functions by section and using prefixes.
+	  - Create openssl helper functions to reduce copy/paste invocations and
+	make the code clearer.
+	  - Make indentation consistent at 2 spaces.
+	  - Change handle_add_pem() to re-use handle_add_chain() once the
+	correct files are identified.
+	  - Change openssl_parse_pem() to return a single array of data
+	structures representing the parsed certs/keys.
+
+2015-05-03 16:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (c46dfbdb5eff)
+
+	* globals.h, init.h, mutt_ssl.c, mutt_ssl_gnutls.c: Provide SSL cipher
+	selection option. (closes #3167)
+
+	Creates a $ssl_ciphers option that allows direct selection of the
+	ciphers for OpenSSL (via SSL_CTX_set_cipher_list) and GnuTLS (via
+	gnutls_priority_set_direct).
+
+	Thank you Sergio Gelato for the patch.
+
+2015-04-25 19:00 -0700  Seth Forshee  <seth@forshee.me>  (755a18da99bc)
+
+	* handler.c: Fix performance regression for ~b/~B searching. (closes
+	#3743)
+
+	In mutt_is_autoview(), changeset b58cdfacfb89 introduced a call to
+	rfc1524_mailcap_lookup() before checking if the MIME type should be
+	autoviewed based on the user's preferences. This caused a major
+	performance regression for ~b/~B searching.
+
+	Rearrange mutt_is_autoview() to check the user preferences first,
+	then search for a mailcap entry only if the MIME type should be
+	autoviewed.
+
+	In order to preserve correct mime_lookup behavior, re-add a call to
+	mutt_check_lookup_list() before scanning the AutoViewList.
+
+2015-04-19 13:15 -0700  Kevin McCarthy  <kevin@8t8.us>  (067a3ac42c3b)
+
+	* crypt-gpgme.c, doc/manual.xml.head, init.h, mutt.h, pgp.c: Add
+	$crypt_confirmhook option. (see #3727)
+
+	Allow the confirmation prompt for crypt-hooks to be disabled. This
+	is useful for multiple crypt-hook users (e.g. encrypted mailing
+	lists), or just for people who are certain of their crypt-hooks and
+	don't want to be prompted every time.
+
+	Thanks to Dale Woolridge for the original patch.
+
+2015-04-19 13:15 -0700  Kevin McCarthy  <kevin@8t8.us>  (b4c57d3fd7e8)
+
+	* crypt-gpgme.c, doc/manual.xml.head, doc/muttrc.man.head, hook.c,
+	pgp.c, protos.h: Allow multiple crypt-hooks with the same regexp.
+	(closes #3727).
+
+	Changes the crypt-hook to accumulate a LIST of hooks with the same
+	regexp, as opposed to replacing the hook data. This is useful for
+	the case of encrypted mailing lists.
+
+	Update pgp classic and gpgme to process a LIST of crypt-hook values
+	instead of just one.
+
+	This version of the patch creates a new _mutt_list_hook() function
+	that (in theory) other hooks could use if they were changed to
+	return a list. It also changes the behavior when a crypt-hook is
+	declined: previously it would immediately use the original recipient
+	for key selection. Now it will only do that if all crypt-hooks for a
+	recipient are declined. This allows all, a subset, or none of the
+	hooks to be used.
+
+	Thanks to Rejo Zenger, Remco Rijnders, and Dale Woolridge for their
+	work on various versions of this patch.
+
+2015-04-15 19:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (1e26a962ab7a)
+
+	* doc/manual.xml.head: Fix a few more incorrect documentation lines
+	for hooks.
+
+	Hopefully this finishes up aac979f8b529 and ca5aff2a4b6e.
+
+2015-04-15 18:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (d12cb775b779)
+
+	* crypt-gpgme.c, doc/manual.xml.head, init.h, pgp.c, pgp.h, pgpkey.c:
+	Use fingerprints instead of keyIDs internally. (see #3695)
+
+	Add a helper function, pgp_fpr_or_lkeyid(), that returns the
+	fingerprint if available, otherwise falls back to the long key id.
+	Convert Mutt to use that value for pgp command invocation.
+
+	Change gpgme to use an equivalent crypt_fpr_or_lkeyid() function in
+	a couple places too (for keylist generation and sign-as key
+	selection).
+
+	Update documentation to mention fingerprints and the --with-
+	fingerprint option for gpg invocation.
+
+	Change pgp_long_ids to default: yes, but add a note mentioning it's
+	only used for the display of key IDs in a few places.
+
+2015-03-12 14:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (bd21cff208c4)
+
+	* recvattach.c: Allow attachments from unencrypted emails to be
+	deleted.
+
+	Print a warning if the message is signed or partly signed.
+
+	Thanks to David Haguenauer for the original patch!
+
+2015-04-06 18:39 -0700  Kevin McCarthy  <kevin@8t8.us>  (ca5aff2a4b6e)
+
+	* doc/muttrc.man.head: Clarify hook pattern vs regexp in muttrc.man
+	page.
+
+	Updates to the muttrc.man page were inadvertently not included in
+	changeset:aac979f8b529. Fix mbox-hook and crypt-hook to show they
+	accept a regexp, not a pattern.
+
+2015-04-05 13:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (e3e6febd8240)
+
+	* contrib/smime.rc: Fix smime.rc typos and spacing issues. (closes
+	#3745)
+
+	Thanks to David J. Weller-Fahy for that patch.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (1bd26d871d76)
+
+	* crypt-gpgme.c: Fix const errors caused by find_keys() changes.
+
+	Part 4 of the oppenc series changed the keyID type to const as part
+	of some cleanup changes. At the time, that only propagated to
+	crypt_getkeybystr(), but with the fingerprint changes, this is
+	starting to propagate too far.
+
+	Create a separate non-const variable to deal with the crypt hook
+	value and revert crypt_getkeybystr()'s parameter to non-const.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (b8ead28d8e84)
+
+	* compose.c, crypt-gpgme.c, pgp.c, smime.c: Add ui elements for oppenc
+	mode.
+
+	Add a status message to the Security line when oppenc is enabled.
+
+	For each send menu, add the ability to toggle it on or off. When
+	enabled, the menus won't show the (e)ncrypt or (b)oth options, and
+	the (c)lear function only clears the SIGN bit when it is active.
+
+	Change the gpgme_send_menu() to directly use the ENCRYPT and SIGN
+	flags instead of the PGPENCRYPT/SIGN and SMIMEENCRYPT/SMIME flags.
+	Using the latter sometimes resulted in the APPLICATION bit unset,
+	which made oppenc unhappy.
+
+	The send_menus previously used a switch statement using choice
+	numbers. Since the menus now vary based on the oppenc option and
+	message bit being set, these were all changed to convert the numbers
+	back to a choice letter.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (2ec6a8d91de4)
+
+	* crypt.c, mutt.h, mutt_crypt.h, postpone.c, send.c, sendlib.c: Add a
+	security bit to the message for oppenc mode.
+
+	This allows oppenc to be enabled/disabled on a message level. If
+	something initially enables encryption, such as crypt_autoencrypt or
+	crypt_replyencrypt, oppenc is turned off for the message.
+
+	Change the postpone/resume code to persist the oppenc bit.
+
+	Also change resend message to enable and invoke oppenc if the option
+	is set.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (b38c4838976f)
+
+	* compose.c, crypt.c, init.h, mutt.h, send.c: Add the
+	crypt_opportunistic_encrypt option and calls.
+
+	This patch creates the OPTCRYPTOPPORTUNISTICENCRYPT option and
+	documentation.
+
+	It also adds calls to crypt_opportunistic_encrypt() during initial
+	message composition, after updating to, cc, or bcc, and after
+	editing the message (if edit_headers is enabled).
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (b10d0a945623)
+
+	* crypt.c, mutt_crypt.h, send.c: Implement
+	crypt_opportunistic_encrypt().
+
+	This function will be called to flip encryption on and off based on
+	message recipients.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (db2abe57adb5)
+
+	* crypt-gpgme.c, pgp.c, pgp.h, pgpkey.c, smime.c: Implement
+	oppenc_mode in the find_keys methods.
+
+	oppenc_mode is used by crypt_opportunistic_encrypt to determine
+	whether there are valid keys for all recipients of a message,
+	without prompting the user.
+
+	The patch wraps around prompts, and makes getkeybyaddr methods
+	return a valid address-matching key without prompting.
+
+	The patch also fixes a small problem with gpgme's getkeybyaddr. When
+	determining if there were multiple strong matches, it was comparing
+	the crypt_key_t instead of its kobj member (gpgme_key_t).
+
+	The patch also enables a call to crypt_is_numerical_keyid() in
+	find_keys(), so that crypt-hooks can actually be checked without
+	prompting when gpgme is enabled. (The addition was patterned off of
+	the pgp_findKeys() function).
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (80b963ff82d3)
+
+	* crypt.c, mutt_crypt.h, pgp.c: Pull is_numerical_keyid() into
+	crypt.c.
+
+	A subsequent patch (re?)-introduces a call to is_numerical_keyid
+	inside find_keys(). Rather than duplicate the function, this patch
+	pulls it into crypt.c, where find_keys() and pgp_findKeys() can both
+	call it.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (04eb395d80a7)
+
+	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-classic.c, crypt-mod-
+	pgp-gpgme.c, crypt-mod-smime-classic.c, crypt-mod-smime-gpgme.c,
+	crypt-mod.h, crypt.c, cryptglue.c, mutt_crypt.h, pgp.c, pgp.h,
+	smime.c, smime.h: Introduce an oppenc_mode parameter
+
+	It's added to the parameter lists through the call stack down to the
+	find_keys calls.
+
+	No functionality is implemented yet. This patch is separated just to
+	keep other patches more readable.
+
+2015-03-30 15:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (5b443e7da81b)
+
+	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-classic.c, crypt-mod-
+	pgp-gpgme.c, crypt-mod-smime-classic.c, crypt-mod-smime-gpgme.c,
+	crypt-mod.h, crypt.c, cryptglue.c, mutt_crypt.h, pgp.c, pgp.h,
+	smime.c, smime.h: Refactor the address list generation out of the
+	find_keys routines.
+
+	All four find_keys routines have a similar set up code for
+	generating a single address list out of the to, cc, bcc lists. This
+	patch pulls all the code into crypt_get_keys.
+
+	This is done to simplify the functions before later patches make
+	them more complicated (with the oppenc_mode parameter).
+
+2015-03-17 16:28 -0700  Kevin McCarthy  <kevin@8t8.us>  (59bd9030e898)
+
+	* doc/manual.xml.head: Document limitation of color index and server-
+	side searches. (see #3723)
+
+2015-03-17 16:28 -0700  Kevin McCarthy  <kevin@8t8.us>  (ab101844dc07)
+
+	* doc/manual.xml.head: Add entries for =B and =h in pattern modifier
+	table.
+
+	Since these operate differently for IMAP, it's worth adding explicit
+	entries to the table for these two.
+
+2015-03-17 16:28 -0700  Kevin McCarthy  <kevin@8t8.us>  (aac979f8b529)
+
+	* doc/manual.xml.head: Clarify hook documentation to specify regexp
+	instead of pattern.
+
+	Account-hook, crypt-hook, and mbox-hook accept a regexp parameter,
+	not a pattern.
+
+2015-03-04 19:24 -0800  Kevin McCarthy  <kevin@8t8.us>  (09be71b645a7)
+
+	* pgp.c: Fix pgp_application_pgp_handler to remove all tempfiles.
+
+	If multiple PGP blocks are present in an email, Mutt only cleans up
+	the tempfiles for the last block. Thanks to Dennis Preiser for the
+	patch and sample mbox file demonstrating the problem.
+
+	This patch also fixes the argument to mutt_perror for the pgpout
+	tempfile.
+
+2015-02-19 11:00 -0800  Kevin McCarthy  <kevin@8t8.us>  (71f12fef8c6f)
+
+	* sendlib.c: merge stable
+
+2015-02-10 18:29 +0100  Peter Wu  <peter@lekensteyn.nl>  (70b85d8b232b)
+
+	* sendlib.c: Fix buffer underread for empty header values. (closes
+	#3736)
+
+	When a header has no value (*p == '\0' so l == 0), do not read
+	outside the buffer but print the newline anyway when a tag is
+	already printed (col != 0).
+
+	Caught by ASAN while opening a draft with no Subject.
+
+2015-02-11 21:38 +0100  Eike Rathke  <erack@erack.de>  (f5b1b75c5958)
+
+	* crypt-gpgme.c, crypt.c, mutt_crypt.h, pgpkey.c: Allow fingerprint
+	user input for key selection. (see #3695)
+
+	Accept and check input of a fingerprint and find the matching key.
+
+	Note that for both to work, match against and display of
+	fingerprint, the pgp_list_pubring_command and
+	pgp_list_secring_command need to contain the
+	--with-fingerprint option, or have with-fingerprint in
+	~/.gnupg/gpg.conf.
+
+2015-02-15 10:09 -0800  Kevin McCarthy  <kevin@8t8.us>  (af5951f5d81c)
+
+	* contrib/gpg.rc, gnupgparse.c: Add fingerprint record parsing for pgp
+	list keys. (see #3695)
+
+	Modify parse_pub_line to parse fpr records and add the fingerprint
+	to the pgp_key_t's fingerprint field.
+
+	Add "--with-fingerprint --with-fingerprint" to the
+	pgp_list_pubring_command and pgp_list_secring_command commands in
+	contrib/gpg.rc. The second invocation generates fpr records for
+	subkeys too.
+
+2015-02-15 10:08 -0800  Kevin McCarthy  <kevin@8t8.us>  (47b4e57b2f1c)
+
+	* pgplib.c, pgplib.h, pgppubring.c: Convert pgp_key_t fingerprint to a
+	char* (see #3695)
+
+	Currently only pgppubring.c is using the fingerprint field, and is
+	using it to store a binary version of the fingerprint.
+
+	Convert the field to store a null-terminated string. Modify
+	pgppubring.c to use to use the new field.
+
+2015-02-10 12:14 -0800  Kevin McCarthy  <kevin@8t8.us>  (385d7434c9d6)
+
+	* pgpkey.c: Protect addr with NONULL in pgp_getkeybyaddr.
+
+	This was introduced by bb3b01f41ed2, but wasn't included in the
+	NONULL checks added in 9a75aa4bd69e.
+
+2015-02-08 14:19 -0800  Kevin McCarthy  <kevin@8t8.us>  (addd7cea01d4)
+
+	* crypt-gpgme.c: Cache uid validity in crypt_key_t.
+
+	In order to find the validity for a crypt_key_t, the code has to
+	loop through the key->kobj->uids list up to the correct index. This
+	is a bit silly since the uid is available when the crypt_key_t is
+	created in get_candidates().
+
+	This patch adds a validity field, and changes the various places to
+	use that instead of looping.
+
+	Also fix a bug in _crypt_compare_trust(): it was using the validity
+	of the first uid instead of the corresponding uid's validity.
+
+2015-02-08 13:44 -0800  Kevin McCarthy  <kevin@8t8.us>  (7162033d1fb8)
+
+	* crypt-gpgme.c: Fix pgp-gpgme to set revoke/expired/disabled flags.
+
+	The code wasn't se