Commit 78160323 authored by Matteo F. Vescovi's avatar Matteo F. Vescovi

Imported Upstream version 1.5.23

parent f04c8cfa
2014-03-12 09:25 -0700 Brendan Cully <brendan@kublai.com> (07556816c588)
* build-release: build-release: make sure version is picked up by
autoconf
* mkchangelog.sh: mkchangelog: only show log entries on current branch
* build-release: No more devel
2014-03-11 10:04 -0700 Michael Elkins <me@sigpipe.org> (3c13c4188912)
* UPDATING: add user visible changes since 1.5.22 release.
* copy.c: Fix buffer overrun caused by not updating a string length
after address expansion.
2013-10-24 09:55 -0700 Michael Elkins <me@sigpipe.org> (3d5e23a66a1a)
* init.h: remove trailing period from documentation for
$pgp_list_secring_command
* init.h: remove trailing period from documentation for
$pgp_list_pubring_command
2013-04-26 12:10 -0700 Kevin McCarthy <kevin@8t8.us> (914e13a3694d)
* postpone.c: 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)
2013-10-22 15:12 -0500 Aaron Schrab <aaron@schrab.com> (4a24e6233a5f)
* version.sh: version.sh: step back from $() to ``. closes #3661
(grafted from 01cf5814dfe5e79b65b1d950aab1276d19a9f031)
2013-07-14 19:48 -0700 Kevin McCarthy <kevin@8t8.us> (b5c894182719)
* muttlib.c: 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.
2013-10-04 18:22 +0000 Michael Elkins <me@sigpipe.org> (95a2230ef889)
* mutt.h, postpone.c, send.c: When recalling a postponed message that
does not have a x-mutt-fcc header field, generate a default FCC just
as we do for new messages. If x-mutt-fcc is present but empty, we
assume that means the user does not want a copy.
closes #3653
2013-10-23 11:11 -0700 Michael Elkins <me@sigpipe.org> (331d48da153b)
* crypt-gpgme.c: Ensure that at least one signature was generated to
catch the case where $pgp_sign_as is unset and no default key is
specified in ~/.gnupg/gpg.conf
closes #3658
2013-10-06 09:15 -0700 Michael Elkins <me@sigpipe.org> (99d913f46eb9)
* handler.c, smime.c: use LOFF_T as the type for variables used in
fseeko()
closes #3487
2013-10-04 18:04 +0000 Michael Elkins <me@sigpipe.org> (dd67e8649ea4)
* crypt-gpgme.c: Display the KeyID when the pubkey is not found in the
user's keyring during signature verification.
closes #3654
2013-10-23 11:11 -0700 Michael Elkins <me@sigpipe.org> (db3028e34ce0)
* mutt_ssl_gnutls.c: return 0 if import of cert failed to match other
error conditions.
2013-10-23 11:11 -0700 Michael Elkins <me@sigpipe.org> (4dde4bcda519)
* mutt_ssl_gnutls.c: only terminate the write-half of the TLS
connection to avoid hanging if the remote doesn't respond.
RFC5246 section 7.2.4 states that the initiator of the closure need
not wait for the remote to response before closing the read-half.
closes #3633
2013-10-22 21:11 -0700 Brendan Cully <brendan@kublai.com> (2ab618f4f6b0)
* create stable branch
2013-10-21 11:58 -0700 Michael Elkins <me@sigpipe.org> (0d9d7c486331)
* doc/manual.xml.head: add note about use of ! ~Q in send-hook when
paired with reply-hook.
2013-10-19 11:23 -0700 Michael Elkins <me@sigpipe.org> (84acf5f0ce92)
* crypt-gpgme.c: remove <stdbool.h> and use "1" instead of "true".
closes #3657
see #3642 for the change that caused this bug.
2013-10-18 14:12 -0700 Michael Elkins <me@sigpipe.org> (b9693e10f431)
* UPDATING: update UPDATING with 1.5.22 release date
2013-10-17 22:55 -0700 Brendan Cully <brendan@kublai.com> (6f5fe49fdf64)
* .hgsigs: mutt-1.5.22 signed
2013-10-17 22:43 -0700 Brendan Cully <brendan@kublai.com> (941ba77040a8)
* .hgtags: Added tag mutt-1-5-22-rel for changeset 8c5ea668e7e0
2013-10-17 22:43 -0700 Brendan Cully <brendan@kublai.com> (8c5ea668e7e0)
* ChangeLog, VERSION, 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: automatic post-release commit for mutt-1.5.22
2013-10-16 16:04 +0000 Michael Elkins <me@sigpipe.org> (5648f4b2ed44)
* rfc822.c: Rework logic to avoid advancing list pointer inside the
......
......@@ -4,7 +4,13 @@ mutt. Please read this file carefully when upgrading your installation.
The keys used are:
!: modified feature, -: deleted feature, +: new feature
1.5.22 (2013-xx-xx):
1.5.23 (2014-03-11):
! FCC is now preserved when postponing a message.
! Mail-Followup-To is now preserved when recalling a postponed message.
! Allow filename prompt when saving multiple attachments to a directory.
1.5.22 (2013-10-18):
! $imap_keepalive default lowered to 300
+ $reflow_text, $reflow_wrap for finer control of flowed wrapping
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for mutt 1.5.22.
# Generated by GNU Autoconf 2.69 for mutt 1.5.23.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mutt'
PACKAGE_TARNAME='mutt'
PACKAGE_VERSION='1.5.22'
PACKAGE_STRING='mutt 1.5.22'
PACKAGE_VERSION='1.5.23'
PACKAGE_STRING='mutt 1.5.23'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1372,7 +1372,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures mutt 1.5.22 to adapt to many kinds of systems.
\`configure' configures mutt 1.5.23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1442,7 +1442,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of mutt 1.5.22:";;
short | recursive ) echo "Configuration of mutt 1.5.23:";;
esac
cat <<\_ACEOF
......@@ -1581,7 +1581,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
mutt configure 1.5.22
mutt configure 1.5.23
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2229,7 +2229,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by mutt $as_me 1.5.22, which was
It was created by mutt $as_me 1.5.23, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3096,7 +3096,7 @@ fi
# Define the identity of the package.
PACKAGE='mutt'
VERSION='1.5.22'
VERSION='1.5.23'
cat >>confdefs.h <<_ACEOF
......@@ -13004,7 +13004,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by mutt $as_me 1.5.22, which was
This file was extended by mutt $as_me 1.5.23, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -13070,7 +13070,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
mutt config.status 1.5.22
mutt config.status 1.5.23
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -284,9 +284,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu contrib/Makefile
$(AUTOMAKE) --foreign contrib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -254,6 +254,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
{
if (!address_header_decode (&this_one))
rfc2047_decode (&this_one);
this_one_len = mutt_strlen (this_one);
}
if (!headers[x])
......
......@@ -43,7 +43,6 @@
#include <sys/stat.h>
#include <errno.h>
#include <ctype.h>
#include <stdbool.h> /* for "true" */
#include <gpgme.h>
......@@ -819,6 +818,7 @@ static BODY *sign_message (BODY *a, int use_smime)
char buf[100];
gpgme_ctx_t ctx;
gpgme_data_t message, signature;
gpgme_sign_result_t sigres;
convert_to_7bit (a); /* Signed data _must_ be in 7-bit format. */
......@@ -860,6 +860,17 @@ static BODY *sign_message (BODY *a, int use_smime)
mutt_error (_("error signing data: %s\n"), gpgme_strerror (err));
return NULL;
}
/* Check for zero signatures generated. This can occur when $pgp_sign_as is
* unset and there is no default key specified in ~/.gnupg/gpg.conf
*/
sigres = gpgme_op_sign_result (ctx);
if (!sigres->signatures)
{
gpgme_data_release (signature);
gpgme_release (ctx);
mutt_error (_("$pgp_sign_as unset and no default key specified in ~/.gnupg/gpg.conf"));
return NULL;
}
sigfile = data_object_to_tempfile (signature, NULL);
gpgme_data_release (signature);
......@@ -1264,21 +1275,31 @@ static void print_smime_keyinfo (const char* msg, gpgme_signature_t sig,
state_attach_puts (msg, s);
state_attach_puts (" ", s);
for (uids = key->uids; uids; uids = uids->next)
/* key is NULL when not present in the user's keyring */
if (key)
{
if (uids->revoked)
continue;
if (aka)
for (uids = key->uids; uids; uids = uids->next)
{
msglen = mutt_strlen (msg) - 4;
for (i = 0; i < msglen; i++)
state_attach_puts(" ", s);
state_attach_puts(_("aka: "), s);
if (uids->revoked)
continue;
if (aka)
{
msglen = mutt_strlen (msg) - 4;
for (i = 0; i < msglen; i++)
state_attach_puts(" ", s);
state_attach_puts(_("aka: "), s);
}
state_attach_puts (uids->uid, s);
state_attach_puts ("\n", s);
aka = 1;
}
state_attach_puts (uids->uid, s);
}
else
{
state_attach_puts (_("KeyID "), s);
state_attach_puts (sig->fpr, s);
state_attach_puts ("\n", s);
aka = 1;
}
msglen = mutt_strlen (msg) - 8;
......@@ -1331,23 +1352,32 @@ static int show_one_sig_status (gpgme_ctx_t ctx, int idx, STATE *s)
if (gpg_err_code (sig->status) != GPG_ERR_NO_ERROR)
anybad = 1;
err = gpgme_get_key (ctx, fpr, &key, 0); /* secret key? */
if (! err)
if (gpg_err_code (sig->status) != GPG_ERR_NO_PUBKEY)
{
err = gpgme_get_key (ctx, fpr, &key, 0); /* secret key? */
if (! err)
{
if (! signature_key)
signature_key = key;
}
else
{
key = NULL; /* Old gpgme versions did not set KEY to NULL on
error. Do it here to avoid a double free. */
}
}
else
{
key = NULL; /* Old gpgme versions did not set KEY to NULL on
error. Do it here to avoid a double free. */
}
{
/* pubkey not present */
}
if (!s || !s->fpout || !(s->flags & M_DISPLAY))
; /* No state information so no way to print anything. */
else if (err)
{
state_attach_puts (_("Error getting key information: "), s);
state_attach_puts (_("Error getting key information for KeyID "), s);
state_attach_puts ( fpr, s );
state_attach_puts (_(": "), s);
state_attach_puts ( gpgme_strerror (err), s );
state_attach_puts ("\n", s);
anybad = 1;
......@@ -1378,9 +1408,13 @@ static int show_one_sig_status (gpgme_ctx_t ctx, int idx, STATE *s)
else /* can't decide (yellow) */
{
print_smime_keyinfo (_("Problem signature from:"), sig, key, s);
state_attach_puts (_(" expires: "), s);
print_time (sig->exp_timestamp, s);
state_attach_puts ("\n", s);
/* 0 indicates no expiration */
if (sig->exp_timestamp)
{
state_attach_puts (_(" expires: "), s);
print_time (sig->exp_timestamp, s);
state_attach_puts ("\n", s);
}
show_sig_summary (sum, ctx, key, idx, s, sig);
anywarn = 1;
}
......@@ -4367,7 +4401,8 @@ static void init_common(void)
#ifdef ENABLE_NLS
gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
#endif
has_run = true;
has_run = 1; /* note use of 1 here is intentional to avoid requiring "true"
to be defined. see #3657 */
}
}
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2009-04-28.21; # UTC
scriptversion=2006-10-15.18
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
# Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -17,7 +17,9 @@ scriptversion=2009-04-28.21; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -85,15 +87,6 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
cygpath_u="sed s,\\\\\\\\,/,g"
depmode=msvisualcpp
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
......@@ -199,14 +192,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> "$depfile"
echo >> "$depfile"
' ' ' >> $depfile
echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> "$depfile"
>> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
......@@ -222,39 +215,34 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
tmpdepfile1=$dir$base.u
tmpdepfile2=$dir$base.u
tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
if test -f "$tmpdepfile"; then :
else
stripped=`echo "$stripped" | sed 's,^.*/,,'`
tmpdepfile="$stripped.u"
fi
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
rm -f "$tmpdepfile"
exit $stat
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a tab and a space in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
......@@ -335,12 +323,7 @@ hp2)
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines.
sed -ne '2,${
s/^ *//
s/ \\*$//
s/$/:/
p
}' "$tmpdepfile" >> "$depfile"
sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
......@@ -416,7 +399,7 @@ dashmstdout)
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
while test $1 != '--mode=compile'; do
shift
done
shift
......@@ -467,39 +450,32 @@ makedepend)
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# X makedepend
shift
cleared=no eat=no
for arg
do
cleared=no
for arg in "$@"; do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
if test $eat = yes; then
eat=no
continue
fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
-arch)
eat=yes ;;
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix=`echo "$object" | sed 's/^.*\././'`
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
......@@ -519,7 +495,7 @@ cpp)
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
while test $1 != '--mode=compile'; do
shift
done
shift
......@@ -557,27 +533,13 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout.
# always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
IFS=" "
for arg
do
case "$arg" in
-o)
shift
;;
$object)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
......@@ -590,23 +552,16 @@ msvisualcpp)
;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvcmsys)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
none)
exec "$@"
;;
......@@ -625,6 +580,5 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# time-stamp-end: "$"
# End:
......@@ -356,9 +356,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
$(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -2602,7 +2602,7 @@ attachments -I message/external-body
#
# This command is used to list the public key ring's contents. The
# output format must be analogous to the one used by
# gpg --list-keys --with-colons.
# gpg --list-keys --with-colons
#
# This format is also generated by the pgpring utility which comes
# with mutt.
......@@ -2621,7 +2621,7 @@ attachments -I message/external-body
#
# This command is used to list the secret key ring's contents. The
# output format must be analogous to the one used by:
# gpg --list-keys --with-colons.
# gpg --list-keys --with-colons
#
# This format is also generated by the pgpring utility which comes
# with mutt.
......
......@@ -935,9 +935,13 @@ details. <span class="emphasis"><em>command</em></span> is executed when
against all messages, both <span class="emphasis"><em>new</em></span> and
<span class="emphasis"><em>replies</em></span>.
</p><div class="note"><h3 class="title">Note</h3><p>
<span class="command"><strong>reply-hook</strong></span>s are matched <span class="emphasis"><em>before</em></span>
the <span class="command"><strong>send-hook</strong></span>, <span class="emphasis"><em>regardless</em></span> of the
order specified in the user's configuration file.
<span class="command"><strong>reply-hook</strong></span>s are matched <span class="emphasis"><em>before</em></span> the
<span class="command"><strong>send-hook</strong></span>, <span class="emphasis"><em>regardless</em></span> of the order
specified in the user's configuration file. However, you can inhibit
<span class="command"><strong>send-hook</strong></span> in the reply case by using the pattern
<code class="literal">'! ~Q'</code> (<span class="emphasis"><em>not replied</em></span>, see
<a class="xref" href="advancedusage.html#pattern-hook" title="5.1. Message Matching in Hooks">Message Matching in Hooks</a>) in the <span class="command"><strong>send-hook</strong></span> to tell
when <span class="command"><strong>reply-hook</strong></span> have been executed.
</p></div><p>
<span class="command"><strong>send2-hook</strong></span> is matched every time a message is
changed, either by editing it, or by using the compose menu to change
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@ Michael Elkins
<me@cs.hmc.edu>
version 1.5.22 (2013-10-16)
version 1.5.23 (2014-03-12)
Abstract
......@@ -2787,7 +2787,9 @@ and replies.
Note
reply-hooks are matched before the send-hook, regardless of the order specified
in the user's configuration file.
in the user's configuration file. However, you can inhibit send-hook in the
reply case by using the pattern '! ~Q' (not replied, see Message Matching in
Hooks) in the send-hook to tell when reply-hook have been executed.
send2-hook is matched every time a message is changed, either by editing it, or
by using the compose menu to change its recipients or subject. send2-hook is
......@@ -8228,7 +8230,7 @@ Default: (empty)
This command is used to list the public key ring's contents. The output format
must be analogous to the one used by
gpg --list-keys --with-colons.
gpg --list-keys --with-colons
This format is also generated by the pgpring utility which comes with mutt.
......@@ -8243,7 +8245,7 @@ Default: (empty)
This command is used to list the secret key ring's contents. The output format
must be analogous to the one used by:
gpg --list-keys --with-colons.
gpg --list-keys --with-colons
This format is also generated by the pgpring utility which comes with mutt.