changeset: 6346:3306cb186f49
user: Brendan Cully <bren...@kublai.com>
date: Tue Oct 29 00:11:16 2013 -0700
link: http://dev.mutt.org/hg/mutt/rev/3306cb186f49
Merge stable into default
diffs (46 lines):
diff -r 1e935cab6f17 -r 3306cb186f49 init.h
--- a/init.h Wed Oct 23 11:20:24 2013 -0700
+++ b/init.h Tue Oct 29 00:11:16 2013 -0700
@@ -1830,7 +1830,7 @@
** This command is used to list the public key ring's contents. The
** output format must be analogous to the one used by
** .ts
- ** gpg --list-keys --with-colons.
+ ** gpg --list-keys --with-colons
** .te
** .pp
** This format is also generated by the \fCpgpring\fP utility which comes
@@ -1846,7 +1846,7 @@
** This command is used to list the secret key ring's contents. The
** output format must be analogous to the one used by:
** .ts
- ** gpg --list-keys --with-colons.
+ ** gpg --list-keys --with-colons
** .te
** .pp
** This format is also generated by the \fCpgpring\fP utility which comes
diff -r 1e935cab6f17 -r 3306cb186f49 muttlib.c
--- a/muttlib.c Wed Oct 23 11:20:24 2013 -0700
+++ b/muttlib.c Tue Oct 29 00:11:16 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)
