changeset: 6341:b5c894182719 user: Kevin McCarthy <ke...@8t8.us> date: Sun Jul 14 19:48:44 2013 -0700 link: http://dev.mutt.org/hg/mutt/rev/b5c894182719
Allow filename prompt when saving multiple attachments to a directory. (closes #3083) Currently, if you specify a directory when saving multiple attachments and choose (a)ll, the first attachment is saved without confirming the filename. Subsequent attachments prompt for the filename. changeset: 6342:4a24e6233a5f user: Aaron Schrab <aa...@schrab.com> date: Tue Oct 22 15:12:31 2013 -0500 link: http://dev.mutt.org/hg/mutt/rev/4a24e6233a5f version.sh: step back from $() to ``. closes #3661 (grafted from 01cf5814dfe5e79b65b1d950aab1276d19a9f031) changeset: 6343:914e13a3694d user: Kevin McCarthy <ke...@8t8.us> date: Fri Apr 26 12:10:46 2013 -0700 link: http://dev.mutt.org/hg/mutt/rev/914e13a3694d Fix postpone/resume to not remove a Mail-Followup-To header (closes #3070) This solution changes mutt_prepare_template() to check whether the message_id field is NULL to decide whether to wipe the message-id and mail-followup-to headers when instantiating the message. If we are resending a message, we don't want the previous message-id and mail-followup-to headers. If we are resuming a postponed message, however, we want to keep the mail-followup-to header if any was set before the postpone. (grafted from d7d83298011a6e7aa31bde49e0b6b21209a85fd2) diffs (58 lines): diff -r 95a2230ef889 -r 914e13a3694d muttlib.c --- a/muttlib.c Fri Oct 04 18:22:15 2013 +0000 +++ b/muttlib.c Fri Apr 26 12:10:46 2013 -0700 @@ -992,16 +992,11 @@ else if ((rc = mutt_yesorno (_("File is a directory, save under it?"), M_YES)) != M_YES) return (rc == M_NO) ? 1 : -1; - if (!attname || !attname[0]) - { - tmp[0] = 0; - if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp), - M_FILE | M_CLEAR) != 0 || !tmp[0]) - return (-1); - mutt_concat_path (fname, path, tmp, flen); - } - else - mutt_concat_path (fname, path, mutt_basename (attname), flen); + strfcpy (tmp, mutt_basename (NONULL (attname)), sizeof (tmp)); + if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp), + M_FILE | M_CLEAR) != 0 || !tmp[0]) + return (-1); + mutt_concat_path (fname, path, tmp, flen); } if (*append == 0 && access (fname, F_OK) == 0) diff -r 95a2230ef889 -r 914e13a3694d postpone.c --- a/postpone.c Fri Oct 04 18:22:15 2013 +0000 +++ b/postpone.c Fri Apr 26 12:10:46 2013 -0700 @@ -551,8 +551,15 @@ newhdr->content->length = hdr->content->length; mutt_parse_part (fp, newhdr->content); - FREE (&newhdr->env->message_id); - FREE (&newhdr->env->mail_followup_to); /* really? */ + /* If message_id is set, then we are resending a message and don't want + * message_id or mail_followup_to. Otherwise, we are resuming a + * postponed message, and want to keep the mail_followup_to. + */ + if (newhdr->env->message_id != NULL) + { + FREE (&newhdr->env->message_id); + FREE (&newhdr->env->mail_followup_to); + } /* decrypt pgp/mime encoded messages */ diff -r 95a2230ef889 -r 914e13a3694d version.sh --- a/version.sh Fri Oct 04 18:22:15 2013 +0000 +++ b/version.sh Fri Apr 26 12:10:46 2013 -0700 @@ -5,7 +5,7 @@ # Switch to directory where this script lives so that further commands are run # from the root directory of the source. The script path and srcdir are double # quoted to allow the space character to appear in the path. -srcdir=$(dirname "$0") && cd "$srcdir" || exit 1 +srcdir=`dirname "$0"` && cd "$srcdir" || exit 1 # Ensure that we have a repo here and that mercurial is installed. If # not, just cat the VERSION file; it contains the latest release number.
