[PATCHES] List of small fixes from the Debian package

To: mutt-dev@xxxxxxxx
Subject: [PATCHES] List of small fixes from the Debian package
From: Adeodato Simó <asp16@xxxxxxxxx>
Date: Sat, 15 Jan 2005 01:28:20 +0100
List-unsubscribe: <mailto:mutt-dev-request@mutt.org?body=unsubscribe>
Mail-followup-to: mutt-dev@xxxxxxxx
Sender: owner-mutt-dev@xxxxxxxx
User-agent: Mutt/1.5.6+20040907i

Hello!

  I've been procrastinating for some time now to send a list of small
  fixes that I've been applying to the mutt package in Debian. Most of
  them are obvious, and I guess that can be commited directly. Some will
  need some sort of check, I'll state so when I belive that's the case.
  So here we go:

  patch.asp.fix-bug-258621.1
  --------------------------

    Small typo in the mutt.1 manpage: Qeury -> Query.

  patch.nf.fix-bug-272579.1
  --------------------------

    Minor formatting issue in the muttrc.5 manpage.

  patch.asp.fix-bug-210679.1
  --------------------------

    Document the interaction between $reverse_name and the alternates.

  patch.asp.fix-bug-254294.1
  --------------------------

    Include reply-hook in the reference section of the manual.

  patch.asp.%p-escape-agent-compatible.1 <-- needs check
  --------------------------------------

    Make the %?p? escape work for $pgp_*_commands when the gnupg agent
    is in use. Update variable definitions in contrib/gpg.rc so that the
    %p escape is used when appropriate.

  patch.asp.fix-bug-266493.1 <-- needs check
  --------------------------

    Fix "mutt ignores first keypress after startup when SIGWINCH".
    Debian bug #123943 is also relevant, and there was some discussion
    on the list some time ago.

  i18n-ca-fix.diff.gz
  i18n-sv-fix.diff.gz
  -------------------

    Minor corrections in these translations, checked with their authors.

  i18n-cs.diff.gz
  i18n-de.diff.gz
  i18n-it.diff.gz
  ---------------

    Major translation updates forgotten in mutt-po.


  And that's all for now. Thanks.

-- 
Adeodato Simó
    EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
 
Truth is the most valuable thing we have, so let's economize it.
                -- Mark Twain

--- a/doc/mutt.man~     2004-07-21 07:31:55.000000000 +0200
+++ b/doc/mutt.man      2004-07-21 07:31:58.000000000 +0200
@@ -84,7 +84,7 @@
 .IP "-p"
 Resume a postponed message.
 .IP "-Q \fIquery\fP"
-Qeury a configuration variables value.  The query is executed after
+Query a configuration variables value.  The query is executed after
 all configuration files have been parsed, and any commands given on
 the command line have been executed.
 .IP "-R"

--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -101,7 +101,7 @@
 .PP
 .nf
 \fBauto_view\fP \fItype\fP[\fB/\fP\fIsubtype\fP] [ ... ]
-\fBunauto_view\fP \fItype\fP[fB/\fP\fIsubtype\fP] [ ... ]
+\fBunauto_view\fP \fItype\fP[\fB/\fP\fIsubtype\fP] [ ... ]
 .fi
 .IP
 This commands permits you to specify that mutt should automatically

--- a/init.h    2004-07-20 15:05:21.000000000 +0200
+++ b/init.h    2004-07-21 17:59:52.000000000 +0200
@@ -2172,8 +2172,10 @@
   ** move the messages to another machine, and reply to some the messages
   ** from there.  If this variable is set, the default \fIFrom:\fP line of
   ** the reply messages is built using the address where you received the
-  ** messages you are replying to.  If the variable is unset, the
-  ** \fIFrom:\fP line will use your address on the current machine.
+  ** messages you are replying to \fBif\fP that address matches your
+  ** alternates.  If the variable is unset, or the address that would be
+  ** used doesn't match your alternates, the \fIFrom:\fP line will use
+  ** your address on the current machine.
   */
   { "reverse_realname",        DT_BOOL, R_BOTH, OPTREVREAL, 1 },
   /*

--- a/doc/manual.sgml.head~     2004-07-21 07:40:37.000000000 +0200
+++ b/doc/manual.sgml.head      2004-07-21 07:42:17.000000000 +0200
@@ -3158,6 +3158,8 @@
 <item>
 <tt><ref id="send-hook" name="send-hook"></tt> <em/regexp/ <em/command/
 <item>
+<tt><ref id="reply-hook" name="reply-hook"></tt> <em/regexp/ <em/command/
+<item>
 <tt><ref id="set" name="set"></tt> 
&lsqb;no|inv&rsqb;<em/variable/&lsqb;=<em/value/&rsqb; &lsqb; <em/variable/ ... 
&rsqb;
 <item>
 <tt><ref id="set" name="unset"></tt> <em/variable/ &lsqb;<em/variable/ ... 
&rsqb;
--- a/doc/muttrc.man.head~      2004-07-21 07:51:45.000000000 +0200
+++ b/doc/muttrc.man.head       2004-07-21 07:48:07.000000000 +0200
@@ -292,6 +292,13 @@
 executed.  When multiple \fBsend-hook\fPs match, they are executed
 in the order in which they occur in the configuration file.
 .TP
+\fBreply-hook\fP [\fB!\fP]\fIpattern\fP \fIcommand\fP
+When replying to a message matching \fIpattern\fP, \fIcommand\fP is
+executed.  When multiple \fBreply-hook\fPs match, they are executed
+in the order in which they occur in the configuration file, but all
+\fBreply-hook\fPs are matched and executed before \fBsend-hook\fPs,
+regardless of their order in the configuration file.
+.TP
 \fBcrypt-hook\fP \fIpattern\fP \fIkey-id\fP
 The crypt-hook command provides a method by which you can
 specify the ID of the public key to be used when encrypting messages

--- a/PATCHES
+++ b/PATCHES
@@ -1,0 +1 @@
+Debian.asp.agent-compatible.1
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -123,7 +123,7 @@
        snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
        snprintf (dest, destlen, fmt, cctx->need_passphrase ? "PGPPASSFD=0" : 
"");
       }
-      else if (!cctx->need_passphrase)
+      else if (!cctx->need_passphrase || pgp_use_gpg_agent())
        optional = 0;
       break;
     }
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -37,15 +37,15 @@
 set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output 
- --verify %s %f"
 
 # decrypt a pgp/mime attachment
-set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet 
 --batch  --output - %f"
+set pgp_decrypt_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose 
--quiet  --batch  --output - %f"
 
 # create a pgp/mime signed attachment
 # set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  
--output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output 
- --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output 
- %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
 
 # create a application/pgp signed (old-style) message
 # set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose 
--batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? 
%f"
-set pgp_clearsign_command="/usr/bin/gpg   --charset utf-8 --no-verbose --batch 
--quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u 
%a? %f"
+set pgp_clearsign_command="/usr/bin/gpg   --charset utf-8 --no-verbose --batch 
--quiet   --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign 
%?a?-u %a? %f"
 
 # create a pgp/mime encrypted attachment
 # set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - 
--encrypt --textmode --armor --always-trust -- -r %r -- %f"
@@ -53,7 +53,7 @@
 
 # create a pgp/mime encrypted and signed attachment
 # set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v 
--batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r 
-- %f"
-set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --charset utf-8 
--passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - 
--encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --charset utf-8 
%?p?--passphrase-fd 0?  --batch --quiet  --no-verbose  --textmode --output - 
--encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 
 # import a key into the public key ring
 set pgp_import_command="/usr/bin/gpg  --no-verbose --import %f"

--- a/curs_main.c       2004-06-28 04:57:39.000000000 +0200
+++ b/curs_main.c       2004-06-28 04:57:49.000000000 +0200
@@ -576,10 +576,6 @@
        move (menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();
 
-      op = km_dokey (MENU_MAIN);
-
-      dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op));
-
 #if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
       if (SigWinch)
       {
@@ -598,6 +594,10 @@
       }
 #endif
 
+      op = km_dokey (MENU_MAIN);
+
+      dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op));
+
       if (op == -1)
        continue; /* either user abort or timeout */

Attachment: i18n-ca-fix.diff.gz
Description: Binary data

Attachment: i18n-sv-fix.diff.gz
Description: Binary data

Attachment: i18n-cs.diff.gz
Description: Binary data

Attachment: i18n-de.diff.gz
Description: Binary data

Attachment: i18n-it.diff.gz
Description: Binary data

Prev by Date: Re: phrasing suggestion
Next by Date: decrypt-saving still deleting messages?
Previous by thread: [2005-01-12] CVS repository changes
Next by thread: decrypt-saving still deleting messages?
Index(es):
- Date
- Thread