automatic post-release commit for mutt-1.3.99mutt-1-3-99-rel

29 files changed, 2962 insertions, 2075 deletions

diff --git a/ChangeLog b/ChangeLog
index 6400b6d8..1dddab0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,520 @@
+Wed May  1 23:06:21 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* build-release: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	s/scp1/scp/
+
+Mon Apr 29 17:12:18 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* lib.c, lib.h, protos.h:
+	From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix #1171.
+
+	* po/fr.po: From: Vincent Lefevre <vincent@vinc17.org>
+
+	update.
+
+	* po/ja.po: From: oota toshiya <oota@mspd.mt.nec.co.jp>
+
+	update.
+
+	* imap/util.c: From: Byrial Jensen <byrial@image.dk>
+
+	There is a possible buffer overflow due an off-by-one error in
+	imap/util.c, line 125. The error is in the maximum field width
+	indication in the sscanf() call. You must have room in the receiving
+	buffer for this number of characters /plus a terminating NULL
+	character/.
+
+	* imap/util.c: From: Byrial Jensen <byrial@image.dk>
+
+	There is a possible buffer overflow due an off-by-one error in
+	imap/util.c, line 125. The error is in the maximum field width
+	indication in the sscanf() call. You must have room in the
+	receiving buffer for this number of characters /plus a
+	terminating NULL character/.
+
+Thu Apr 25 13:30:49 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* pop.c, pop_lib.c: From: Vsevolod Volkov <vvv@mutt.org.ua>
+
+	Attached patch fixes the problem described below. It should be
+	applied to both mutt 1.3/1.4 and 1.5 branches.
+
+	> Date: Thu, 11 Apr 2002 16:24:00 -0500
+	> Subject: mutt 1.3.x / pop
+	> From: "Ryan O'Hara" <rohara@isis.visi.com>
+	> To: bcully@users.sourceforge.net
+	> User-Agent: Mutt/1.3.27i
+
+	> Hi. My apologies if this has nothing to do with you. If it does not,
+	> maybe you could forward it on to someone.
+
+	> In mutt 1.3.x I have noticed that if I uses POP to retrieve mail, and
+	> I enter an incorrect password whem prompted, it will *save* that
+	> password and keep trying to use it. However, in the 1.2.x versions it
+	> worked like this: type in wrong POP password, try to connect to POP
+	> server again and it will ask you (again) for the password. mutt 1.3.x
+	> does not, it just tries to connect with the wrongs password (which
+	> just failed).
+
+	> This is kinda annoying. Just thought I'd point out this regression.
+
+	> Thanks.
+	> R
+
+	* doc/manual.sgml.head: From: Wouter Verheijen <wv@xs2mail.com>
+
+	Someone in news:comp.mail.mutt noted that the list of command-line
+	options in the manual is not up-to-date.
+
+	Included a small patch that includes all options that 'mutt -h' shows.
+
+	* doc/manual.sgml.tail, init.h, OPS, pattern.c:
+	From: Cedric Duval <cedricduval@free.fr>
+
+	attached are fixes for some little mistakes :
+
+	* history-down -> scroll _down_, not up
+	* functions decode-(save|copy) do not exist in the attach menu.
+	* gettext oversight in pattern.c
+	* inconsistency between "printf-like sequences" used all over the place
+	  and "escape sequences" for the description of $attribution.
+
+	* doc/manual.sgml.tail, pattern.c, init.h, OPS:
+	From: Cedric Duval <cedricduval@free.fr>
+
+	attached are fixes for some little mistakes :
+
+	* history-down -> scroll _down_, not up
+	* functions decode-(save|copy) do not exist in the attach menu.
+	* gettext oversight in pattern.c
+	* inconsistency between "printf-like sequences" used all over the
+	  place and "escape sequences" for the description of $attribution.
+
+	* recvattach.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Also fix this for the S/MIME case.
+
+	* recvattach.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fiy handling of multiparts which have encrypted sub-parts, at least
+	for PGP.
+
+	* sendlib.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Force 7bit encoding for application/pgp-keys.
+
+Sat Apr 20 21:38:47 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* m4/Attic/lib-ld.m4, m4/Attic/lib-link.m4, m4/Attic/lib-prefix.m4, m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4, intl/Attic/eval-plural.h, intl/Attic/gmo.h, intl/Attic/localename.c, intl/Attic/os2compat.c, intl/Attic/os2compat.h, intl/Attic/osdep.c, intl/Attic/plural-exp.c, intl/Attic/plural-exp.h, intl/bindtextdom.c, intl/ChangeLog, intl/config.charset, intl/dcigettext.c, intl/gettextP.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/Makefile.in, intl/plural.c, intl/plural.y, ABOUT-NLS, Attic/config.rpath, configure.in, INSTALL:
+	From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Backing out the latest iconv-related changes from the
+	mutt-1-4-stable branch.
+
+	* m4/Attic/lib-ld.m4, m4/Attic/lib-link.m4, m4/Attic/lib-prefix.m4, m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4:
+	same as above.
+
+	* intl/Attic/eval-plural.h, intl/Attic/gmo.h, intl/Attic/localename.c, intl/Attic/os2compat.c, intl/Attic/os2compat.h, intl/Attic/osdep.c, intl/Attic/plural-exp.c, intl/Attic/plural-exp.h, intl/gettextP.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/plural.c, intl/plural.y, intl/bindtextdom.c, intl/ChangeLog, intl/config.charset, intl/dcigettext.c, intl/Makefile.in:
+	From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Committing the new iconv patches into a separate branch.
+
+	* ABOUT-NLS, Attic/config.rpath, configure.in, INSTALL:
+	From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Committing the new noiconv patches into a separate branch.
+
+	* sendlib.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Generate the resent-message-id ourselves, and add it in the top of
+	the header.
+
+	* copy.c, mutt.h, sendlib.c: From: Wouter Verheijen <wv@xs2mail.com>
+
+	Bug #571 "mutt should not replicate ">From " headers while bounding",
+	has a patch attached.
+	Will that patch get in?
+
+	Although these lines are not generated by mutt, I would strongly
+	suggest
+	to prevent it, because by boucing a mail the MUA should ensure
+	that the message header is according to the specification.
+	A ">From " line is not, because of the spaces before a colon.
+
+	Because this has such serious consequences (totally unreadable mail)
+	when a MTA interpretes this line as the beginning of the body (not
+	unreasonable), I think Mutt should prevent sending this invalid
+	headerline.
+
+	Because the other patch to the bugreport is not really correct IMHO
+	(because the fieldnames are not limited to alphanumeric chars, RFC2822
+	3.6.8), I propose another one.
+
+	This patch also appends Resent-* to the header, instead of
+	prepending it. The Resent-Message-Id is however still appended,
+	because I could not find it; is it added by the MTA instead of by
+	Mutt?
+
+	* m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4:
+	Try to get the noiconv patch to work.
+
+	* configure.in: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Try to get the noiconv patch to work with my development environment.
+
+	* INSTALL: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix a typo.
+
+	* init.h, rfc2047.c, sendlib.c, charset.c, charset.h, configure.in, gnupgparse.c, INSTALL:
+	From: Lars Hecking <lhecking@nmrc.ie>
+
+	 patch.1.3.28.lh.noiconv
+	 =======================
+
+	 This is the new version of my noiconv patch. It _requires_ the previous
+	 patch! If applied without, you'll have to resolve a couple of conflicts
+	 manually.
+
+	 Notes:
+	 - it's a lot cleaner than the old noiconv patch because no m4 files are
+	   modified
+	 - new configure option --disable-iconv; INSTALL updated accordingly
+	   [I am guessing here, but the background for the --without-iconv option
+	    mentioned in INSTALL was that mutt had a without-iconv option before
+	    gettext included iconv support. When mutt's intl/* files were updated
+	    to a newer gettext, there suddenly were two iconv options, which then
+	    got merged, that is, mutt's was removed. That was probably when
+	    --without-iconv stopped working, but I'm not sure, it may well be that
+	    it never worked since iconv support was introduced.]
+	 - all changes in *.[ch] files should be identical to the old patch
+
+	* intl/Attic/localename.c:
+	file localename.c was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/localename.c: From: Lars Hecking <lhecking@nmrc.ie>
+
+	This one seems to have been missing, too.
+
+	* Attic/config.rpath:
+	file config.rpath was initially added on branch mutt-1-4-stable.
+
+	* Attic/config.rpath: From: Lars Hecking <lhecking@nmrc.ie>
+
+	Another file from the gettext patch.
+
+	* m4/Attic/lib-ld.m4:
+	file lib-ld.m4 was initially added on branch mutt-1-4-stable.
+
+	* m4/Attic/lib-link.m4:
+	file lib-link.m4 was initially added on branch mutt-1-4-stable.
+
+	* m4/Attic/lib-prefix.m4:
+	file lib-prefix.m4 was initially added on branch mutt-1-4-stable.
+
+	* m4/Attic/lib-ld.m4, m4/Attic/lib-link.m4, m4/Attic/lib-prefix.m4:
+	From: Lars Hecking <lhecking@nmrc.ie>
+
+	Add new m4 files from patch.1.3.28.lh.gettext-0.11.1.
+
+	* m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4:
+	From: Lars Hecking <lhecking@nmrc.ie>
+
+	 patch.1.3.28.lh.gettext-0.11.1
+	 ==============================
+
+	 This one updates the gettext stuff in mutt to gettext-0.11.1. I started
+	 doing this in the hope that the new gettext version would simplify the
+	 noiconv patch, but unfortunately, this turned out not to be the case
+	 (the new iconv m4 macros still don't allow for switching iconv support off).
+
+	 However, as a few hours of merging and testing were spent, I'd suggest to
+	 adopt it for 1.4. The actual changes to intl/* are part cosmetic, part code
+	 reorganisation. Ok, a bit more, I'm no gettext expert :)
+
+	 Notes:
+	 - after applying the patch, you need to chmod 755 config.rpath
+	 - a couple of new files for m4/*, too
+	 - I have broken with the tradition of renaming gettext's AM_* macros
+	   to MUTT_AM_*! I don't think it's necessary anymore to customise these
+	   macros, but you (I really mean "you, tlr" :) want to have a look at
+	   the new gettext.m4.  The others should be ok as they are.
+	 - previous gettext updates were also updating po/Makefile.in.in, which
+	   I didn't; someone who has a clue about gettext should check whether
+	   this might be necessary, and also whether any other files in po/ need
+	   updating
+
+	 I will provide the same patch for the 1.5 branch at some stage, ideally
+	 after getting some  F E E D B A C K  for this one.
+
+	* intl/Attic/eval-plural.h:
+	file eval-plural.h was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/gmo.h:
+	file gmo.h was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/os2compat.c:
+	file os2compat.c was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/os2compat.h:
+	file os2compat.h was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/osdep.c:
+	file osdep.c was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/plural-exp.c:
+	file plural-exp.c was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/plural-exp.h:
+	file plural-exp.h was initially added on branch mutt-1-4-stable.
+
+	* intl/Attic/eval-plural.h, intl/Attic/gmo.h, intl/Attic/os2compat.c, intl/Attic/os2compat.h, intl/Attic/osdep.c, intl/Attic/plural-exp.c, intl/Attic/plural-exp.h, intl/bindtextdom.c, intl/ChangeLog, intl/config.charset, intl/dcigettext.c, intl/gettextP.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/Makefile.in, intl/plural.c, intl/plural.y, ABOUT-NLS, charset.c, charset.h, configure.in, gnupgparse.c, init.h, rfc2047.c, sendlib.c:
+	From: Lars Hecking <lhecking@nmrc.ie>
+
+	 patch.1.3.28.lh.gettext-0.11.1
+	 ==============================
+
+	 This one updates the gettext stuff in mutt to gettext-0.11.1. I started
+	 doing this in the hope that the new gettext version would simplify the
+	 noiconv patch, but unfortunately, this turned out not to be the case
+	 (the new iconv m4 macros still don't allow for switching iconv support off).
+
+	 However, as a few hours of merging and testing were spent, I'd suggest to
+	 adopt it for 1.4. The actual changes to intl/* are part cosmetic, part code
+	 reorganisation. Ok, a bit more, I'm no gettext expert :)
+
+	 Notes:
+	 - after applying the patch, you need to chmod 755 config.rpath
+	 - a couple of new files for m4/*, too
+	 - I have broken with the tradition of renaming gettext's AM_* macros
+	   to MUTT_AM_*! I don't think it's necessary anymore to customise these
+	   macros, but you (I really mean "you, tlr" :) want to have a look at
+	   the new gettext.m4.  The others should be ok as they are.
+	 - previous gettext updates were also updating po/Makefile.in.in, which
+	   I didn't; someone who has a clue about gettext should check whether
+	   this might be necessary, and also whether any other files in po/ need
+	   updating
+
+	 I will provide the same patch for the 1.5 branch at some stage, ideally
+	 after getting some  F E E D B A C K  for this one.
+
+Wed Apr 17 17:05:54 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* po/fr.po: From: Vincent Lefevre <vincent@vinc17.org>
+
+	Update.
+
+	* m4/gssapi.m4: From: David Champion <dgc@uchicago.edu>
+
+	MIT krb5 1.2.4 has krb5-config, so it's no longer sufficient to say
+	that possession of krb5-config indicates Heimdal. Patch attached. This
+	assumes that Heimdal's "kreb5-config --vendor" begins with "Heimdal".
+	I cannot verify that this is correct, so patch might be wrong on this
+	point.
+
+Sun Apr  7 21:19:57 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* imap/command.c, imap/imap.c, imap/message.c:
+	From: Brendan Cully <brendan@kublai.com>
+
+	The attached patch cleans up some bugs in switching IMAP mailboxes:
+	* free current flags on mailbox close
+	* reset reopen state
+	* don't parse the same untagged SELECT response for multiple options
+	* call mx_update_context after reading the whole mailbox, not after
+	  each message
+	* reset new mail flag if mail arrives in the middle of opening the
+	  mailbox. This should close 1139
+
+	939 is most likely unaffected. I discovered these problems while
+	investigating 939.
+
+Fri Apr  5 10:42:54 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* po/ja.po: From: "TAKAHASHI, Tamotsu" <arms405@jade.dti.ne.jp>
+
+	update.
+
+Thu Apr  4 20:49:46 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* po/ko.po: From: Im Eunjea <eunjea@koru.org>
+
+	Update.
+
+	* po/ja.po: From: "TAKAHASHI, Tamotsu" <arms405@jade.dti.ne.jp>
+
+	Update.
+
+	* pgp.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix a typo noted by Tamotsu Takahashi.
+
+Wed Apr  3 15:22:27 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* handler.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix printing of format=flowed text parts.
+
+	* commands.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix #1144 in stable.
+
+	* commands.c: From: Thomas Roessler <roessler@does-not-exist.org>
+
+	Fix a file descriptor leak in the display filter code.  Noted by
+	Chr. v. Stuckrad.
+
+	fixes: #1144
+
+Tue Apr  2 18:49:37 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* m4/iconv.m4: From: Lars Hecking <lhecking@nmrc.ie>
+	The noiconv patch.
+
+	* charset.c, charset.h, configure.in, gnupgparse.c, init.h, rfc2047.c, sendlib.c:
+	The noiconv patch.
+
+	From: Lars Hecking <lhecking@nmrc.ie>
+
+Sat Mar 30 08:26:31 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* po/pl.po: update.  From Pawel Dzienkonski.
+
+	* po/fr.po: Update; From Vincent Lefevre.
+
+	* postpone.c, sendlib.c:
+	The attached patch allows the user to override the user-agent field
+	with my_hdr.  It also removes the stripping of the x-mailer field
+	when recalling a postponed message.
+
+Thu Mar 28 13:25:23 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* mx.c, mx.h, mailbox.h, main.c, mbox.c, mh.c:
+	patch-1.3.28-me.emptycheck.1
+
+Wed Mar 27 08:50:42 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* pgp.c: There was some output missing.
+
+	* po/POTFILES.in: update.
+
+	* pgp.c:
+	More fixes.  Note to self:  The code which controls character set
+	selection for attachments is far too complicated.
+
+	* pgp.c:
+	Don't include temporary file names in the Content-Disposition header.
+
+	* pgp.c:
+	Use text/plain; format=... when we are asked to detect inline PGP
+	material in in text/plain body parts.
+
+	* pgp.c, sendlib.c: Fix encoder mode for text/plain; action=pgp-*.
+
+	* pgp.c:
+	Fix "noconv" handling for the message body when we generate inline
+	PGP.
+
+	* charset.c, charset.h, handler.c, muttlib.c, pgp.c:
+	Some hackisch charset handling for text/plain; x-action=pgp-*.  I
+	don't like this stuff, but it's better than nothing.
+
+Tue Mar 26 22:25:48 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* pgp.c: Change x-action values to "pgp-encrypted", "pgp-signed".
+
+	* contrib/gpg.rc, commands.c, compose.c, crypt.c, handler.c, muttlib.c, pgp.c, protos.h, recvattach.c, sendlib.c:
+	More inline PGP changes.
+
+	* pgp.c:
+	Also permit for "action" and "x-action" on the receiving end, just
+	in case we can settle on a joint standard with other MUA developers.
+
+	* commands.c, crypt.c, handler.c, pgp.c, pgpinvoke.c, sendlib.c:
+	OK, I'm giving up: pgp_create_traditional now creates text/plain;
+	x-mutt-action={pgp-encrypt,pgp-sign}.
+
+	* pgpinvoke.c: Fix application/pgp signatures.
+
+	* charset.c, charset.h, gnupgparse.c, handler.c, mbyte.c, rfc2047.c, sendlib.c:
+	Fix iconv warnings; from Edmund Grimley Evans.
+
+	* smime.c:
+	Please use ascii_strcasecmp() if you want to compare ASCII parameter
+	strings.  mutt_strcasecmp() depends on the locale, and detects "i"
+	and "I" as _different_ in Turkish locales.
+
+Mon Mar 25 11:34:40 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* crypt.c:
+	Fix S/MIME signature type.  Noted by Dan Ohnesorg <Dan@ohnesorg.cz>.
+
+	* buffy.c: close 1103; from Brendan Cully
+
+	* doc/manual.sgml.tail: close 1122; from Brendan Cully
+
+	* hdrline.c, muttlib.c: Fix #87s; from Brendan Cully.
+
+	* hdrline.c, muttlib.c: Fix #872, from Brendan Cully.
+
+	* contrib/smime_keys_test.pl, contrib/Makefile.in:
+	Include a test script by Mike Schiraldi.  It's perl > the one I have
+	installed, so I'm just putting it into contrib for now.
+
+Wed Mar 20 09:53:42 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* editmsg.c, mailbox.h, mx.c: Rename M_NEW to M_NEWFOLDER.
+
+	* editmsg.c, mailbox.h, mx.c:
+	Rename the new M_NEW by M_NEWFOLDER.  There was another constant of
+	the same name.  Problem noted by Will Yardley's compiler.
+
+Tue Mar 19 09:54:05 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* browser.c: Fix #1115.
+
+	* editmsg.c, mailbox.h, mx.c:
+	Fix a temporary file race problem when using the edit-message
+	function.  Backported from unstable.
+
+	* po/pl.po: update
+
+Mon Mar 18 18:54:56 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* browser.c: Should fix #1115.  BACKPORT!
+
+Fri Mar 15 09:11:05 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* po/ja.po: update from oota toshiya.
+
+	* po/ja.po: update, from oota toshiya.
+
+Wed Mar 13 23:43:41 2002  Thomas Roessler  <roessler@does-not-exist.org>
+
+	* attach.c:
+	Undoing the previous patch.  It was junk, and may ruin files.
+
+	* attach.c, editmsg.c, mailbox.h, mx.c:
+	Don't fopen mail folders in append mode where we should safe_fopen()
+	them in write mode.  Debian bug #138200, noted by Colin Philipps
+	<cph@cph.demon.co.uk>.
+
+	NEEDS BACKPORTING.
+
+	* po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, po/da.po, po/de.po, po/el.po, po/Attic/ChangeLog, po/ca.po, po/cs.po:
+	automatic post-release commit for mutt-1.3.28
+
+	* po/Attic/ChangeLog:
+	file ChangeLog was initially added on branch mutt-1-4-stable.
+
+	* ChangeLog, reldate.h, VERSION:
+	automatic post-release commit for mutt-1.3.28
+
+	* doc/smime-notes.txt, smime.c: Assorted patches from Mike Schiraldi.
+
 Wed Mar 13 12:31:02 2002  Thomas Roessler  <roessler@does-not-exist.org>
 
 	* doc/smime-notes.txt, smime.c: Assorted patches from Mike Schiraldi.
diff --git a/VERSION b/VERSION
index 5574de9b..3e7fd5b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.28
+1.3.99
diff --git a/po/ca.po b/po/ca.po
index 77a1cebe..603b964b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.3.27i\n"
-"POT-Creation-Date: 2002-03-13 13:50+0100\n"
+"POT-Creation-Date: 2002-05-02 01:08+0200\n"
 "PO-Revision-Date: 2002-02-02 11:29+01:00\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -104,7 +104,7 @@ msgstr "El nom de fitxer no concorda amb cap «nametemplate»; continuar?"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Cal que l'entrada «compose» de «mailcap» continga «%%s»."
 
-#: attach.c:131 attach.c:256 commands.c:185 compose.c:1154 curs_lib.c:145
+#: attach.c:131 attach.c:256 commands.c:190 compose.c:1154 curs_lib.c:145
 #: curs_lib.c:374
 #, c-format
 msgid "Error running \"%s\"!"
@@ -263,7 +263,7 @@ msgstr "No es pot veure un directori."
 msgid "Error trying to view file"
 msgstr "Error en intentar veure el fitxer."
 
-#: buffy.c:410
+#: buffy.c:413
 #, c-format
 msgid "New mail in %s."
 msgstr "Hi ha correu nou en «%s»."
@@ -351,95 +351,95 @@ msgstr "No s'ha pogut crear el filtre de visualització."
 msgid "Could not copy message"
 msgstr "No s'ha pogut copiar el missatge."
 
-#: commands.c:168
+#: commands.c:173
 msgid "PGP signature successfully verified."
 msgstr "S'ha pogut verificar amb èxit la signatura PGP."
 
-#: commands.c:169
+#: commands.c:174
 msgid "PGP signature could NOT be verified."
 msgstr "NO s'ha pogut verificar la signatura PGP."
 
-#: commands.c:192
+#: commands.c:197
 msgid "Command: "
 msgstr "Ordre: "
 
-#: commands.c:210 recvcmd.c:140
+#: commands.c:215 recvcmd.c:140
 msgid "Bounce message to: "
 msgstr "Redirigeix el missatge a: "
 
-#: commands.c:212 recvcmd.c:142
+#: commands.c:217 recvcmd.c:142
 msgid "Bounce tagged messages to: "
 msgstr "Redirigeix els missatges marcats a: "
 
-#: commands.c:227
+#: commands.c:232
 msgid "Error parsing address!"
 msgstr "Error en interpretar l'adreça!"
 
 # ivb (2001/12/02)
 # ivb  El programa posa l'interrogant.
-#: commands.c:242
+#: commands.c:247
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Voleu redirigir el missatge a %s"
 
 # ivb (2001/12/02)
 # ivb  El programa posa l'interrogant.
-#: commands.c:242
+#: commands.c:247
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Voleu redirigir els missatges a %s"
 
-#: commands.c:256
+#: commands.c:261
 msgid "Message bounced."
 msgstr "S'ha redirigit el missatge."
 
-#: commands.c:256
+#: commands.c:261
 msgid "Messages bounced."
 msgstr "S'han redirigit els missatges."
 
-#: commands.c:334 commands.c:373 commands.c:390
+#: commands.c:339 commands.c:378 commands.c:395
 msgid "Can't create filter process"
 msgstr "No s'ha pogut crear el procés filtre."
 
-#: commands.c:419
+#: commands.c:424
 msgid "Pipe to command: "
 msgstr "Redirigeix a l'ordre: "
 
-#: commands.c:436
+#: commands.c:441
 msgid "No printing command has been defined."
 msgstr "No s'ha definit cap ordre d'impressió."
 
-#: commands.c:441
+#: commands.c:446
 msgid "Print message?"
 msgstr "Voleu imprimir el missatge?"
 
-#: commands.c:441
+#: commands.c:446
 msgid "Print tagged messages?"
 msgstr "Voleu imprimir els misatges marcats?"
 
-#: commands.c:450
+#: commands.c:455
 msgid "Message printed"
 msgstr "S'ha imprés el missatge."
 
-#: commands.c:450
+#: commands.c:455
 msgid "Messages printed"
 msgstr "S'han imprés els missatges."
 
-#: commands.c:452
+#: commands.c:457
 msgid "Message could not be printed"
 msgstr "No s'ha pogut imprimir el missatge."
 
-#: commands.c:453
+#: commands.c:458
 msgid "Messages could not be printed"
 msgstr "No s'han pogut imprimir els missatges."
 
-#: commands.c:462
+#: commands.c:467
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
 "Ordre inv (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/taman(y)/(p)unt?: "
 
-#: commands.c:463
+#: commands.c:468
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 msgstr ""
@@ -447,73 +447,73 @@ msgstr ""
 
 # ivb (2001/11/18)
 # ivb  (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/taman(y)/(p)unt
-#: commands.c:464
+#: commands.c:469
 msgid "dfrsotuzc"
 msgstr "dortsfcyp"
 
-#: commands.c:517
+#: commands.c:522
 msgid "Shell command: "
 msgstr "Ordre per l'intèrpret: "
 
-#: commands.c:647
+#: commands.c:652
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "Descodifica i desa%s en la bústia"
 
-#: commands.c:648
+#: commands.c:653
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "Descodifica i còpia%s en la bústia"
 
-#: commands.c:649
+#: commands.c:654
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Desxifra i desa%s en la bústia"
 
-#: commands.c:650
+#: commands.c:655
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Desxifra i còpia%s en la bústia"
 
-#: commands.c:651
+#: commands.c:656
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "Desa%s en la bústia"
 
-#: commands.c:651
+#: commands.c:656
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "Còpia%s en la bústia"
 
-#: commands.c:652
+#: commands.c:657
 msgid " tagged"
 msgstr " els marcats"
 
-#: commands.c:720
+#: commands.c:725
 #, c-format
 msgid "Copying to %s..."
 msgstr "S'està copiant en «%s»..."
 
-#: commands.c:841
+#: commands.c:846
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Voleu convertir en «%s» en enviar?"
 
-#: commands.c:849
+#: commands.c:854
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "S'ha canviat «Content-Type» a «%s»."
 
-#: commands.c:851
+#: commands.c:856
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "S'ha canviat el joc de caràcters a «%s»; %s."
 
-#: commands.c:853
+#: commands.c:858
 msgid "not converting"
 msgstr "es farà conversió"
 
-#: commands.c:853
+#: commands.c:858
 msgid "converting"
 msgstr "no es farà conversió"
 
@@ -650,7 +650,7 @@ msgstr "Reanomena a: "
 # ivb (2001/11/19)
 # ivb  Cuidadín: en «compose» la cadena és el nom de fitxer i en
 # ivb  «editmsg» i «sendlib» és la cadena d'error.
-#: compose.c:987 editmsg.c:96 sendlib.c:902
+#: compose.c:987 editmsg.c:96 sendlib.c:906
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ha fallat stat() sobre «%s»: %s"
@@ -1300,14 +1300,14 @@ msgstr "La bústia ha de tenir un nom."
 msgid "Mailbox created."
 msgstr "S'ha creat la bústia."
 
-#: imap/command.c:289
+#: imap/command.c:288
 msgid "Mailbox closed"
 msgstr "S'ha tancat la bústia."
 
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:326
+#: imap/command.c:325
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Error fatal.  El recompte de missatges no es troba sincronitzat!"
 
@@ -1333,61 +1333,61 @@ msgstr "No s'ha pogut negociar la connexió TLS."
 msgid "Selecting %s..."
 msgstr "S'està seleccionant la bústia «%s»..."
 
-#: imap/imap.c:669
+#: imap/imap.c:667
 msgid "Error opening mailbox"
 msgstr "Error en obrir la bústia."
 
 #. STATUS not supported
-#: imap/imap.c:722
+#: imap/imap.c:720
 msgid "Unable to append to IMAP mailboxes at this server"
 msgstr "Aquest servidor no permet afegir a les bústies IMAP."
 
 #. command failed cause folder doesn't exist
-#: imap/imap.c:731 imap/message.c:595 muttlib.c:1174
+#: imap/imap.c:729 imap/message.c:596 muttlib.c:1175
 #, c-format
 msgid "Create %s?"
 msgstr "Voleu crear «%s»?"
 
-#: imap/imap.c:767
+#: imap/imap.c:765
 msgid "Closing connection to IMAP server..."
 msgstr "S'està tancant la connexió amb el servidor IMAP..."
 
-#: imap/imap.c:930 pop.c:465
+#: imap/imap.c:928 pop.c:465
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "S'estan marcant %d missatges com a esborrats..."
 
-#: imap/imap.c:939
+#: imap/imap.c:937
 msgid "Expunge failed"
 msgstr "No s'han pogut eliminar els missatges."
 
-#: imap/imap.c:954
+#: imap/imap.c:952
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "S'estan guardant els senyaladors d'estat dels missatges... [%d/%d]"
 
-#: imap/imap.c:1038
+#: imap/imap.c:1036
 msgid "Expunging messages from server..."
 msgstr "S'estan eliminant missatges del servidor..."
 
-#: imap/imap.c:1043
+#: imap/imap.c:1041
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: Ha fallat «EXPUNGE»."
 
-#: imap/imap.c:1077
+#: imap/imap.c:1075
 msgid "CLOSE failed"
 msgstr "Ha fallat «CLOSE»."
 
-#: imap/imap.c:1325
+#: imap/imap.c:1324
 msgid "Bad mailbox name"