automatic post-release commit for mutt-1.9.0mutt-1-9-rel

31 files changed, 6265 insertions, 4389 deletions

diff --git a/ChangeLog b/ChangeLog
index 5493fbde..9373e9ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1708 @@
+2017-09-02 09:36 -0700  Kevin McCarthy  <kevin@8t8.us>  (3cd63d517453)
+
+	* po/cs.po, po/eo.po, po/nl.po: Fix the new certificate prompt
+	translations.
+
+	The Esperanto, Dutch, and Czech po files weren't updated in time for
+	1.9. Fix the certificate prompt translations by adding a "(s)kip"
+	choice. Otherwise the prompts would not be functional.
+
+2017-08-29 09:19 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (52ba6fd58607)
+
+	* po/ja.po: Updated Japanese translation.
+
+2017-08-27 09:28 -0700  Ivan Vilata i Balaguer  <ivan@selidor.net>  (2666f4de9eb8)
+
+	* po/ca.po: Updated Catalan translation.
+
+2017-08-22 19:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (b506fa3e7aab)
+
+	* UPDATING: Add 1.9.0 entries to the UPDATING file.
+
+2017-08-22 13:51 -0700  Morten Bo Johansen  <mjb@spamcop.net>  (f1638434cb43)
+
+	* po/da.po: Updated Danish translation.
+
+2017-08-22 10:59 -0700  Morten Bo Johansen  <mjb@spamcop.net>  (cce15c0169af)
+
+	* po/da.po: Updated Danish translation.
+
+2017-08-22 10:28 -0700  Olaf Hering  <olaf@aepfle.de>  (3606d018ea75)
+
+	* po/de.po: Updated German translation.
+
+2017-08-20 09:39 -0700  Vsevolod Volkov  <vvv@mutt.org.ua>  (584cc7ee5016)
+
+	* po/ru.po: Updated Russian translation.
+
+2017-08-20 09:31 -0700  Vsevolod Volkov  <vvv@mutt.org.ua>  (ed0fff2be143)
+
+	* po/uk.po: Updated Ukrainian translation.
+
+2017-08-19 08:33 -0700  Kevin McCarthy  <kevin@8t8.us>  (190e778db4d6)
+
+	* doc/manual.xml.head, globals.h, init.h, mutt.h, sendlib.c: Add
+	option to run command to query attachment mime type. (closes #2933)
+	(closes #3959)
+
+	Add $mime_type_query_command to specify a command to run if the
+	attachment extension is not in the mime.types file.
+
+	Add $mime_type_query_first to allow the query command to be run
+	before the mime.types lookup.
+
+2017-08-12 22:17 +0200  Vincent Lefevre  <vincent@vinc17.net>  (69e3bde9f83d)
+
+	* po/fr.po: Updated French translation.
+
+2017-08-11 09:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (1306ee5f4bf7)
+
+	* recvcmd.c: Fix parent_hdr usage in mutt_attach_reply(). (see #3728)
+
+	If the selected attachments are not messages and no (common) parent
+	is found, parent_hdr is set to the passed in hdr. In that case,
+	parent will still be NULL, but parent_hdr and parent_fp will be set.
+
+	Change the test to parent_hdr being NULL, not parent, to check for
+	this case.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (052ad4fcdd6b)
+
+	* commands.c, protos.h, recvattach.c: Add edit-content-type helper and
+	warning for decrypted attachments. (closes #3728)
+
+	Regenerating the actx index will overwrite any changes made to a
+	decrypted attachment. Change the mutt_edit_content_type() function
+	to return 1 when a structural change is made. Add a warning message
+	when that is the case and a decrypted message was edited, so the
+	user is not surprised.
+
+	Note: mutt_edit_content_type() appeared to regenerate multipart
+	subparts every time, leading to a memory leak. I believe this was an
+	oversite, and it should have regenerated only when there were no
+	subparts, so have "fixed" this.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (38855dc0a02a)
+
+	* crypt-gpgme.c, crypt-gpgme.h, crypt-mod-pgp-classic.c, crypt-mod-
+	pgp-gpgme.c, crypt-mod.h, cryptglue.c, mutt_crypt.h, pgp.c,
+	recvattach.c: Fix attachment check_traditional and extract_keys
+	operations. (see #3728)
+
+	Add helpers and iterate over the actx->idx instead of the BODY
+	structure.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (e6e8b2f1fae3)
+
+	* attach.h, compose.c, pager.c, recvattach.c, recvcmd.c: Fix shared
+	attachment functions. (see #3728)
+
+	With nested decryption, the correct FP is associated with the
+	ATTACHPTR entry. Also, the BODY entries are not continguous, so the
+	functions need to iterate over the actx index, not the BODY
+	structure.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (26e06bd4f29d)
+
+	* recvattach.c: Fix the expand/collapse code to use the virtual index.
+	(see #3728)
+
+	Fix the init code to respect OPTDIGESTCOLLAPSE.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (c7fe290bc3a3)
+
+	* attach.c, attach.h, compose.c, recvattach.c: Add virtual index to
+	actx. (see #3728)
+
+	The virtual index is modeled after the CONTEXT. Add a CURATTACH
+	helper to reduce code verbosity. Store the actx as menu->data.
+
+	Simplify and consolidate the recvattach and compose menu update code
+	inside a function.
+
+	Because compose and recvattach share so much code, change compose to
+	use the virtual index even though it has no collapse/expand
+	functionality.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (23ce88ed8961)
+
+	* attach.c, attach.h, compose.c, protos.h, recvattach.c: Change
+	recvattach to allow nested encryption. (see #3728)
+
+	* Add a FP and BODY array to the actx. These are used to allow
+	proper cleanup.
+
+	* Add HEADER and root_fp entries, to allow for index regeneration.
+
+	* Separate out the compose and recvattach index generation
+	functions.
+
+	* Change the recvattach index generator to decrypt as encrypted
+	parts are found.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (ee1fd4a71a8a)
+
+	* attach.c, attach.h, compose.c, recvattach.c: Add helpers to add and
+	remove actx entries. (see #3728)
+
+	Use the helper in compose update_idx(), to consolidate the resize
+	logic and simplify the code.
+
+	Separate out the actx "free" routine from a routine to empty out the
+	idx. The index regeneration routines should flush and rebuild the
+	index without having to renerate the actx structure.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (b8bbccd98632)
+
+	* attach.c, attach.h, browser.c, compose.c, pager.c, pager.h,
+	recvattach.c, recvcmd.c: Change helpers functions to pass actx. (see
+	#3728)
+
+	Change the pager, compose, recvattach and recvcmd to pass the actx
+	instead of the individual idx and idxlen parameters.
+
+	Separate out the compose menu exit logic to first free the BODY data
+	and then call the shared actx free function at the bottom.
+
+2017-08-10 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (278b6efc6bba)
+
+	* attach.c, attach.h, compose.c, recvattach.c: Create ATTACH_CONTEXT
+	to hold attachment index. (see #3728)
+
+	Move the idx and idxlen into ATTACH_CONTEXT. In subsequence patches,
+	this structure will hold more useful items, such as the virtual
+	index.
+
+	The swap out is straightforward, except for:
+	  * update_idx() in compose.c, which post-increments the idxlen in the
+	call and again in the function.
+	  * mutt_gen_attach_list() which doesn't need to returns the new values.
+
+2017-08-09 08:08 -0700  lilydjwg  <lilydjwg@gmail.com>  (5f034395e53d)
+
+	* po/zh_CN.po: Updated Simplified Chinese translation.
+
+2017-08-08 09:13 -0700  Olaf Hering  <olaf@aepfle.de>  (86f709e4be55)
+
+	* po/de.po: Updated German translation.
+
+2017-08-06 10:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (f8df8c43e5c0)
+
+	* pager.c: Handle error if REGCOMP in pager fails when resizing.
+
+	Thanks to JiaZhouyang for finding this issue and supplying the
+	original patch.
+
+2017-08-04 09:29 -0700  Olaf Hering  <olaf@aepfle.de>  (ac2fda8bc9c4)
+
+	* po/de.po: Updated German translation.
+
+2017-07-28 10:54 -0700  Kevin McCarthy  <kevin@8t8.us>  (f83de1e03e08)
+
+	* configure.ac, mutt_socket.c: Convert raw_socket_poll() to use
+	gettimeofday().
+
+	As long as gettimeofday() is supported, it's better to be consistent
+	within mutt and ensure greater portability.
+
+	Change the raw_socket_poll() wait timer to count milliseconds, like
+	the mutt_progess_update() code.
+
+	Thanks to Vincent Lefèvre for his, as always, invaluable advice.
+
+2017-07-27 00:20 +0100  Vincent Lefevre  <vincent@vinc17.net>  (eeb5ff58ab14)
+
+	* po/fr.po: Updated French translation.
+
+2017-07-24 11:19 -0700  Kevin McCarthy  <kevin@8t8.us>  (f94a97422cd0)
+
+	* configure.ac, mutt_socket.c: Add autoconf search for clock_gettime.
+
+	It appears to be specified in POSIX.1-2001, so just abort if it's
+	not found.
+
+	Add a missing time.h include in mutt_socket.c
+
+2017-07-22 19:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (4a1390537a29)
+
+	* globals.h, imap/command.c, imap/imap.c, imap/imap_private.h, init.h:
+	Add $imap_poll_timeout to allow mailbox polling to time out.
+
+	Enable the polling flag for the NOOP in imap_check_mailbox(), the
+	STATUS command in imap_buffy_check(), and the LOGOUT command.
+
+	This is not intended to handle all blocking-IO related issues.
+	However, the periodic NOOP and STATUS are the most frequent places
+	for mutt to freeze up, especially after a laptop is sleep/woken.
+
+	Since these are quick operations with little data, this is a good
+	place to check if the connection is still working before hanging on
+	a read.
+
+2017-07-22 19:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (908bea74acef)
+
+	* imap/imap.c, mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h,
+	mutt_tunnel.c: Add timeout parameter to mutt_socket_poll.
+
+	This will be used in the next commit to add a timeout when polling
+	for new mail.
+
+2017-07-20 17:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (a533c22715c8)
+
+	* mutt.h, sendlib.c: When guessing an attachment type, don't allow
+	text/plain if there is a null character. (see #2933)
+
+	Type text/plain should not contain any null characters. Slightly
+	improve the type guesser by forcing an attachment with any null
+	characters to be application/octet-stream.
+
+	Note the type guesser could use much more improvement, but this is
+	an easy and obvious fix.
+
+2017-07-19 14:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (2204d7ed4d94)
+
+	* imap/command.c, imap/imap.c, menu.c: merge stable
+
+2017-07-19 14:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (78cc40b6ba9e)
+
+	* imap/command.c, imap/imap.c: Change imap_cmd_start() to return OK
+	when the cmd_queue is finished. (closes #3956)
+
+	Some response handlers can end up recursively calling
+	imap_cmd_start(), processing all the command completions. If the
+	outer call was an imap_exec(), this would result in the loop never
+	being terminated (or just blocking reading a server that has already
+	finished all the commands).
+
+	Change the callers that are simply using it to read a response,
+	without having called cmd_start(), to check for IMAP_CMD_OK instead.
+	Currently this is just the open connection function.
+
+2017-07-19 14:04 -0700  Kevin McCarthy  <kevin@8t8.us>  (cf98f5d606a3)
+
+	* menu.c: Fix menu color calls to occur before positioning the cursor.
+	(see #3956)
+
+	It is possible for menu->color() to end up fetching an imap message,
+	and therefore generating a status message.
+
+	Because of this, we need to make those calls before we position the
+	cursor.
+
+2017-07-14 15:19 -0700  Kevin McCarthy  <kevin@8t8.us>  (c4e507003aa0)
+
+	* regex.c: Decrease regex failure stack limit. (closes #3955)
+
+	When using alloca(), the built-in regexp library limited the failure
+	stack to 20,000 entries. This value is too large, and causes
+	alloca() to segfault in the example provided in the ticket.
+
+	Decrease the limit to 8000.
+
+	Thanks to Thorsten Wißmann for the excellent bug report, which made
+	debugging this much easier.
+
+2017-07-13 22:05 -0700  Brendan Cully  <brendan@kublai.com>  (9430d2357bc2)
+
+	* imap/imap.c, imap/imap.h, mx.c: drop unused flags argument from
+	imap_access
+
+	We are not using an actual interface so it is pointless.
+
+2017-07-12 21:20 -0700  Brendan Cully  <brendan@kublai.com>  (742c96078159)
+
+	* bcache.c: bcache: cast to avoid implicit signed/unsigned comparison
+	in bcache_path
+
+2017-07-12 12:39 -0700  Kevin McCarthy  <kevin@8t8.us>  (51d22025190a)
+
+	* imap/imap.c: merge stable
+
+2017-07-12 12:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (02c6dd3a30cc)
+
+	* imap/imap.c: Fix crash when $postponed is on another server.
+
+	imap_mxcmp() translates NULL to "INBOX". When $postponed points to a
+	URL with an empty or "INBOX" path, this will end up matching against
+	a NULL idata->mailbox in imap_status(). This resulted in a crash
+	because idata->ctx is also NULL.
+
+	Thanks to Olaf Hering for the detailed bug report and suggested fix.
+
+2017-07-08 16:35 -0700  Brendan Cully  <brendan@kublai.com>  (952e4fcf1e2b)
+
+	* imap/imap.c: fix signed/unsigned comparison in longest_common_prefix
+
+2017-07-05 19:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (428e36fb2262)
+
+	* doc/manual.xml.head, doc/muttrc.man.head, mutt.h, pattern.c: Add
+	~<() and ~>() immediate parent/children patterns. (closes #3144)
+
+	Thanks to Jeremie Le Hen for the original patch, and for his
+	persistence in getting this feature merged.
+
+2017-07-03 19:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (c87d2a88308a)
+
+	* po/bg.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po,
+	po/eu.po, po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po,
+	po/ko.po, po/lt.po, po/pl.po, po/pt_BR.po, po/sk.po, po/sv.po,
+	po/tr.po, po/zh_CN.po, po/zh_TW.po: Remove stale certificate prompt
+	translations.
+
+	With the OpenSSL changes, unmaintained translation prompts will not
+	function properly.
+
+	Clear out the translation strings for those using different action
+	keys.
+
+	This changeset does not touch the translation files that are
+	actively maintained. They will be properly updated before the 1.9.0
+	release.
+
+2017-07-03 19:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (752f3e879d50)
+
+	* po/bg.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po,
+	po/eo.po, po/es.po, po/et.po, po/eu.po, po/fr.po, po/ga.po,
+	po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po,
+	po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po,
+	po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po: Update po
+	files.
+
+2017-07-03 19:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (b90d818b768c)
+
+	* mutt_ssl_gnutls.c: Add L10N comments to the GNUTLS certificate
+	prompt.
+
+	The prompts are shared with OpenSSL, and so the prompts end up being
+	separate from the action key strings.
+
+2017-07-02 17:53 -0700  Kevin McCarthy  <kevin@8t8.us>  (680300397f3d)
+
+	* init.h: Add more description for the %S and %Z $index_format
+	characters.
+
+2017-07-01 19:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (c45291f87137)
+
+	* globals.h, init.h, protos.h, recvcmd.c, send.c: Add config vars for
+	forwarded message attribution intro/trailer.
+
+	Add $forward_attribution_intro and $forward_attribution_trailer to
+	allow the default strings to be overridden.
+
+2017-06-26 15:54 -0700  Antonio Radici  <antonio@dyne.org>  (88602d33a49a)
+
+	* init.h: Fix typo in smime_self_encrypt_as documentation. (closes
+	#3953)
+
+2017-06-26 15:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (c50abea2ec80)
+
+	* init.h: merge stable
+
+2017-06-26 15:44 -0700  Regid Ichira  <regid23@nt1.in>  (826efa89631f)
+
+	* init.h: Minor documentation fixes.
+
+	The muttrc man page doesn't contain the "Format Strings" section in
+	the manual, so add a pointer to the explanation of conditionals in
+	$status_format.
+
+2017-06-20 15:09 -0700  Kevin McCarthy  <kevin@8t8.us>  (219b9064cf28)
+
+	* mutt_socket.c: Block SIGWINCH during connect(). (closes #3941)
+
+	FreeBSD's connect() does not respect SA_RESTART, so a SIGWINCH will
+	end up interrupting the connect.
+
+	If this code is needed in other places, it should be moved into
+	signal.c. For this one place, inlining the sigprocmask() seemed
+	okay.
+
+2017-06-18 10:58 -0700  Kevin McCarthy  <kevin@8t8.us>  (d56fd3f91de9)
+
+	* compose.c: Improve the L10N comment about Sign as.
+
+	Make it clearer what the indentation behavior is, and add
+	suggestions about the width.
+
+	Thanks to TAKAHASHI Tamotsu for the original patch suggesting
+	changes to the L10N comments.
+
+2017-06-18 10:58 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (0efae3363358)
+
+	* po/ja.po: Updated Japanese translation.
+
+2017-06-14 19:21 -0700  Kevin McCarthy  <kevin@8t8.us>  (7dc8a6a3592a)
+
+	* crypt-gpgme.c: Auto-pad translation for the GPGME key selection
+	"verify key" headers.
+
+	Remove the ridiculous need for the translators to pad the
+	translation strings themselves.
+
+2017-06-14 15:23 -0700  Morten Bo Johansen  <mjb@spamcop.net>  (2188de087f35)
+
+	* po/da.po: Updated Danish translation.
+
+2017-06-14 15:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (e8368cedbd95)
+
+	* compose.c, init.h, send.c: Enable all header fields in the compose
+	menu to be translated.
+
+	While it is suggested they need not be, for some locales it might be
+	preferable to be able to localize the fields.
+
+	For instance, fr_FR may want to change the punctuation to have a
+	space in front of the colon. ja_JP may be more comfortable with a
+	native character set description of the field when using it every
+	day.
+
+2017-06-12 18:29 -0700  Kevin McCarthy  <kevin@8t8.us>  (0e3730ed2c3c)
+
+	* sendlib.c: Force hard redraw after $sendmail instead of calling
+	mutt_endwin. (closes #3952) (see #3948)
+
+	Adding a mutt_endwin() seemed like a clean solution to allowing
+	ncurses pinentry for $sendmail, but it leaves other users watching a
+	blank screen. This change is extremely likely to generate a large
+	number of complaints and bug reports. So instead, force a hard
+	refresh afterwards.
+
+2017-06-12 17:57 -0700  Kevin McCarthy  <kevin@8t8.us>  (26cbf2cac701)
+
+	* crypt-gpgme.c: Make GPGME key selection behavior the same as
+	classic-PGP. (see #3950)
+
+	Classic-PGP key selection auto-selected a match if there was a
+	single strong, valid, address-match result, even if there were other
+	weak matches.
+
+	GPGME was prompting in the same situation, if there were other weak
+	matches.
+
+	Change GPGME to match the classic behavior, as this is more useful
+	and matches the manual description.
+
+2017-06-09 11:31 -0700  Consus  <consus@gmx.com>  (dd0208f13983)
+
+	* compose.c: Rename 'sign as' to 'Sign as'; makes compose menu more
+	consistent.
+
+2017-06-09 11:31 -0700  Kevin McCarthy  <kevin@8t8.us>  (b4d0bb558636)
+
+	* compose.c: Change the compose menu fields to be dynamically padded.
+
+	Pad based on the maximum width of the fields. Note that this is a
+	bit of a mess, because some of the fields are translated while
+	others are not.
+
+2017-06-08 13:26 -0700  Kevin McCarthy  <kevin@8t8.us>  (966f08249216)
+
+	* init.c, pgp.c: Backout 02ff4277259e (see #3948)
+
+	Vincent expressed some legitimate concerns about exporting this to
+	all programs lauched by mutt. The user can always set GPG_TTY in
+	their .bashrc if needed for $sendmail. cf90bf5989f3 should resolve
+	the refresh issue.
+
+2017-06-06 18:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (cf90bf5989f3)
+
+	* sendlib.c: Add a mutt_endwin() before invoking $sendmail. (closes
+	#3948)
+
+	This is to support invoking a program such as msmtp that can use gpg
+	to decrypt a password. The ncurses pinentry can corrupt the screen
+	unless we exit curses.
+
+2017-06-06 18:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (02ff4277259e)
+
+	* init.c, pgp.c: Move setting of GPG_TTY to mutt_init(). (see #3948)
+
+	This allows other programs mutt runs to use the ncurses pinentry if
+	needed.
+
+2017-06-06 18:38 -0700  Kevin McCarthy  <kevin@8t8.us>  (915ba3928d49)
+
+	* configure.ac, m4/gettext.m4, pgp.c, protos.h, setenv.c: Restore
+	setenv function.
+
+	Partially revert fa1192803257, restoring setenv. It turns out we
+	still need the function.
+
+2017-06-02 13:17 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (a11770c2137b)
+
+	* po/ja.po: Updated Japanese translation.
+
+2017-06-01 15:17 -0700  Kevin McCarthy  <kevin@8t8.us>  (f26adb2b0543)
+
+	* curs_main.c, menu.c: Fix tag-prefix to not abort on $timeout.
+
+	If $timeout is set very low, then it can cancel the tag-prefix
+	before the user has time to press the desired command.
+
+	Change the code to set the tag flag, and then recontinue with normal
+	event processing instead. Cancel on an abort, but continue with a
+	timeout.
+
+	Thanks to Lauri Tirkkonen for reporting the issue.
+
+2017-06-01 15:17 -0700  Kevin McCarthy  <kevin@8t8.us>  (ec6530cb0a5a)
+
+	* curs_main.c, enter.c, keymap.c, menu.c, pager.c: Change km_dokey()
+	to return -2 on a timeout/sigwinch.
+
+	In some cases, such as tag-prefix or _mutt_enter_string(), it is
+	desirable to be able to distinguish between a timeout/sigwinch event
+	and an input error/abort/ctrl-g.
+
+2017-06-01 13:55 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (152d548c1bcf)
+
+	* main.c: Enable TEXTDOMAINDIR override to make translation testing
+	easier.
+
+	If set, TEXTDOMAINDIR will point to a translation directory instead
+	of using the mutt installation directory.
+
+2017-06-01 13:33 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (4e29b337e967)
+
+	* crypt-gpgme.c, hook.c, init.c, main.c, mutt_ssl.c, pattern.c, pop.c,
+	pop_auth.c: Fix "format string is not a string literal" warnings.
+	(closes #3949)
+
+	Mutt calls msgfmt with '-c' to verify that translation format
+	strings match, but it is still safer to indirect strings with no
+	formatting through %s.
+
+2017-05-31 16:19 -0700  Kevin McCarthy  <kevin@8t8.us>  (093b0c6c6d86)
+
+	* doc/manual.xml.head: merge stable
+
+2017-05-31 16:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (d3922568a777)
+
+	* doc/manual.xml.head: Add note about message scoring and thread
+	patterns. (see #3947)
+
+	Because scoring occurs before the mailbox is sorted, thread patterns
+	don't work. Document a suggested workaround of pushing the score
+	command in a folder hook.
+
+	Also, fix the link target for the score command synopsis.
+
+2017-05-30 12:49 -0700  Kevin McCarthy  <kevin@8t8.us>  (35fba390b1f3)
+
+	* merge stable
+
+2017-05-30 12:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (fff7d4bb459a)
+
+	* .hgsigs: mutt-1.8.3 signed
+
+2017-05-30 12:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (6a54fbc38fa4)
+
+	* .hgtags: Added tag mutt-1-8-3-rel for changeset fe5275246e13
+
+2017-05-30 12:47 -0700  Kevin McCarthy  <kevin@8t8.us>  (fe5275246e13)
+
+	* ChangeLog, UPDATING, VERSION: automatic post-release commit for
+	mutt-1.8.3
+
+2017-05-29 11:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (228364e8abb7)
+
+	* init.h, send.c: Change $postpone_encrypt to use self-encrypt
+	variables first.
+
+	The concept of postpone encryption is similar to self-encrypting on
+	send. The problem is the $postpone_encrypt_as option doesn't take
+	into account whether PGP or S/MIME is being used.
+
+	Since we need to add the new options for self-encryption, modify
+	$postpone_encrypt to use them by default instead, falling back to
+	$postpone_encrypt_as if they are unset. Note $postpone_encrypt_as is
+	deprecated in the documentation.
+
+2017-05-29 11:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (ca95f3e38355)
+
+	* crypt.c, globals.h, init.h, mutt.h: Add self-encrypt options for PGP
+	and S/MIME.
+
+	Add $pgp_self_encrypt, $pgp_self_encrypt_as, $smime_self_encrypt,
+	$smime_self_encrypt_as.
+
+	$pgp_sign_as and $smime_default_key are inappropriate to use, as
+	they specify signing key/certs. In some cases, this is a different
+	value than the encryption key/cert.
+
+2017-05-29 11:48 -0700  Kevin McCarthy  <kevin@8t8.us>  (085fc55029d8)
+
+	* smime.c: Convert classic s/mime to space delimit findKeys output.
+
+	Unlike gpgme and classic pgp, smime used a "cert\ncert\n" pattern.
+	Convert to use a space-delimited format, so the self-encrypt option
+	code can be uniform across pgp, s/mime, and gpgme.
+
+2017-05-24 15:46 -0700  Kevin McCarthy  <kevin@8t8.us>  (a636bc4a4940)
+
+	* imap/message.c: Change imap body cache cleanup to use the uid_hash.
+
+	This should speed up $message_cache_clean cleanup when syncing.
+
+2017-05-23 15:54 -0700  Kevin McCarthy  <kevin@8t8.us>  (8904261ed212)
+
+	* merge stable
+
+2017-05-23 15:53 -0700  Kevin McCarthy  <kevin@8t8.us>  (fa0c2155ab8f)
+
+	* mx.c: Fix memory leak when closing mailbox and using the sidebar.
+
+	The code updating the sidebar counts decremented the msgcount, but
+	did not set it back to the original value. Which means fastclose was
+	not freeing all the headers.
+
+	Update the sidebar only when something is deleted, since I don't
+	believe it's required otherwise and the code is a bit cleaner that
+	way.
+
+2017-05-22 18:30 -0700  Kevin McCarthy  <kevin@8t8.us>  (407100d15766)
+
+	* imap/imap.c: Don't clean up msn idata when closing an open-append
+	mailbox. (see #3942)
+
+	This is a continuation of commit 59a2125b49f2 with changes made in
+	the default branch.
+
+	Thanks again to Will Yardley for helping test the imap read-headers
+	changes and discovering this bug.
+
+2017-05-22 18:25 -0700  Kevin McCarthy  <kevin@8t8.us>  (aec6b48e8ea5)
+
+	* imap/imap.c: merge stable
+
+2017-05-22 18:18 -0700  Kevin McCarthy  <kevin@8t8.us>  (59a2125b49f2)
+
+	* imap/imap.c: Don't clean up idata when closing an open-append
+	mailbox.
+
+	open-append borrows the idata just for the connection. The "mailbox
+	specific" part of the idata may be being used by a normal open-
+	mailbox.
+
+	Don't free the idata "mailbox specific" part when closing an open-
+	append mailbox.
+
+	Thanks to Will Yardley for discovering the bug as part of testing
+	the revised IMAP fetch_headers code (in the default branch).
+
+2017-05-22 05:14 -0700  Kevin McCarthy  <kevin@8t8.us>  (e614fb00459b)
+
+	* merge stable
+
+2017-05-22 05:08 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (1ddf2641f369)
+
+	* mx.c: Fix potential segv if mx_open_mailbox is passed an empty
+	string. (closes #3945)
+
+	If path is "", ctx->path will be NULL. realpath() generally will
+	segv if the first parameter is NULL.
+
+2017-05-22 04:43 -0700  Kevin McCarthy  <kevin@8t8.us>  (4ab3a8a2e321)
+
+	* imap/message.c: Fix mfc overflow check and uninitialized variable.
+
+	The check borrowed from mx_alloc_memory() works because it is
+	incremented 25 at a time. I don't believe it will work for the
+	direct set case used in imap_alloc_msn_index(). Instead, use a more
+	conservative check.
+
+	In imap_read_headers(), make sure mfhrc is initialized. It would be
+	tested without being set if imap_cmd_step() returned OK right away.
+
+2017-05-21 18:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (5904c6376f77)
+
+	* imap/message.c: Don't abort header cache evaluation when there is a
+	hole. (see #3942)
+
+	Instead, find the first missing MSN and generate a more complicated
+	sequence set specifying the missing ranges.
+
+	This removes the assumption that the header cache query returned
+	results in MSN order.
+
+2017-05-21 18:45 -0700  Kevin McCarthy  <kevin@8t8.us>  (1658ab70377b)
+
+	* imap/message.c: Small imap fetch fixes. (see #3942)
+
+	Add an integer overflow test, pulled from mx_alloc_memory(), since
+	the count comes from a potentially hostile server.
+
+	After reviewing the RFC a bit, it turns out the server is not
+	supposed to send EXPUNGE responses during a FETCH. Change the
+	comment, but keep the conservative code.
+
+2017-05-21 10:51 -0700  Kevin McCarthy  <kevin@8t8.us>  (f87c679e508f)
+
+	* imap/message.c: Properly adjust fetch ranges when handling new mail.
+	(see #3942)
+
+	When pulling down headers, it is possible for expunge responses to
+	happen too. If we get a new mail count, we need to take into account
+	changes to the max_msn due to the expunges.
+
+2017-05-20 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (77d3173aecff)
+
+	* imap/command.c, imap/imap.c, imap/imap_private.h, imap/message.c:
+	Add msn_index and max_msn to find and check boundaries by MSN. (see
+	#3942)
+
+	Since there can be gaps in MSNs, the largest MSN in the context is
+	not necessarily ctx->msgcount.
+
+	Use max_msn instead of ctx->msgcount for:
+	  - the starting MSN of new mail header fetching
+	  - boundary checking in fetch, expunge, and other places
+
+	Use msn_index to efficiently look up headers by MSN. This makes the
+	expunge code slightly more efficient. It also makes FETCH handling,
+	and duplicate FETCH FLAG handling efficient.
+
+2017-05-20 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (5289d2caadbb)
+
+	* imap/command.c, imap/imap.c, imap/imap_private.h, imap/message.c:
+	Start fixing imap_read_headers() to account for MSN gaps. (see
+	#3942)
+
+	Change the parameters to pass MSN instead of index, to make a bit
+	simpler.
+
+	Change header cache evaluation to look at the largest MSN retrieved
+	instead of ctx->msgcount for the next fetch start point. This still
+	depends on the assumption that MSNs are retrieved in ascending
+	order, which needs to be fixed.
+
+	Simplify the header cache inner loop termination and memory cleanup
+	logic. Fix a memory leak if a hole in the header cache occured.
+
+	Fix the header retrieval logic to take into account MSN gaps in the
+	results. Loop only as long as we get IMAP_CMD_CONTINUE instead of
+	over a fixed count. Simplify the inner loop termination and memory
+	cleanup logic too.
+
+	Simplify the "new mail while fetching" logic by creating a third
+	outer loop to handle re-fetches.
+
+	Fix msg_fetch_header() to return -2 if msg_parse_fetch() encounters
+	a corrupt FETCH response. Previously it would pass on the rc of
+	msg_parse_fetch(), meaning it would return -1 even though the
+	response was corrupt.
+
+2017-05-20 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (b85bf6466c79)
+
+	* imap/command.c: Fix cmd_parse_fetch() to match against MSN. (see
+	#3942)
+
+2017-05-20 18:52 -0700  Kevin McCarthy  <kevin@8t8.us>  (ab3595fbb698)
+
+	* imap/command.c, imap/imap.c: Fix imap expunge to match msn and fix
+	index. (see #3942)
+
+	The expunge needs to match against the MSN now.