Import mutt_1.5.11-2

[software/mutt-debian.git] / upstream / extra-patches / compressed-folders

diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders
index 35634f0ba034ead88766cdb53b5773a79815c796..1d15cadab3beab3dff03eeef1c6b724d527c26f7 100644 (file)
--- a/upstream/extra-patches/compressed-folders
+++ b/upstream/extra-patches/compressed-folders
@@ -7,8 +7,8 @@ The home page for this patch is:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:

-  - Date: 2005-08-14
-  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz
+  - Date: 2005-09-29
+  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.11.rr.compressed.1.gz

 
 * Changes made:
   - filterdiff -p1 \
 
 * Changes made:
   - filterdiff -p1 \


@@ -16,9 +16,9 @@ The home page for this patch is:
       doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
 
 == END PATCH
       doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
 
 == END PATCH

-diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c
---- mutt-1.5.10/compress.c     1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.10-ro/compress.c  2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/compress.c mutt-1.5.11-ro/compress.c
+--- mutt-1.5.11/compress.c     1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.11-ro/compress.c  2005-09-27 13:26:58.000000000 +0200

 @@ -0,0 +1,487 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
 @@ -0,0 +1,487 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>


@@ -507,9 +507,9 @@ diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c
 +}
 +
 +#endif /* USE_COMPRESSED */
 +}
 +
 +#endif /* USE_COMPRESSED */

-diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h
---- mutt-1.5.10/compress.h     1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.10-ro/compress.h  2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/compress.h mutt-1.5.11-ro/compress.h
+--- mutt-1.5.11/compress.h     1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.11-ro/compress.h  2005-09-27 13:26:58.000000000 +0200

 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>


@@ -538,12 +538,12 @@ diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);

-diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in
-diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure
-diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in
---- mutt-1.5.10/configure.in   2005-08-11 23:49:24.000000000 +0200
-+++ mutt-1.5.10-ro/configure.in        2005-08-14 12:10:21.000000000 +0200
-@@ -753,6 +753,11 @@
+diff -urN mutt-1.5.11/config.h.in mutt-1.5.11-ro/config.h.in
+diff -urN mutt-1.5.11/configure mutt-1.5.11-ro/configure
+diff -urN mutt-1.5.11/configure.in mutt-1.5.11-ro/configure.in
+--- mutt-1.5.11/configure.in   2005-09-15 16:21:24.000000000 +0200
++++ mutt-1.5.11-ro/configure.in        2005-09-27 13:26:58.000000000 +0200
+@@ -711,6 +711,11 @@

                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  


@@ -555,10 +555,10 @@ diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in
  AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
          [if test $withval != yes; then
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
  AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
          [if test $withval != yes; then
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",

-diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c
---- mutt-1.5.10/curs_main.c    2005-08-11 21:37:01.000000000 +0200
-+++ mutt-1.5.10-ro/curs_main.c 2005-08-14 12:10:21.000000000 +0200
-@@ -1087,6 +1087,11 @@
+diff -urN mutt-1.5.11/curs_main.c mutt-1.5.11-ro/curs_main.c
+--- mutt-1.5.11/curs_main.c    2005-09-07 10:19:43.000000000 +0200
++++ mutt-1.5.11-ro/curs_main.c 2005-09-27 13:26:58.000000000 +0200
+@@ -1091,6 +1091,11 @@

          {
          int check;
  
          {
          int check;
  


@@ -570,24 +570,22 @@ diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c
          mutt_str_replace (&LastFolder, Context->path);
          oldcount = Context ? Context->msgcount : 0;
  
          mutt_str_replace (&LastFolder, Context->path);
          oldcount = Context ? Context->msgcount : 0;
  

-diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html
-diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html
-diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html
-diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml
-diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head
---- mutt-1.5.10/doc/manual.sgml.head   2005-08-11 21:37:02.000000000 +0200
-+++ mutt-1.5.10-ro/doc/manual.sgml.head        2005-08-14 12:10:21.000000000 +0200
-@@ -2576,6 +2576,176 @@
- macro pager \cb |urlview\n
- </verb></tscreen>
+diff -urN mutt-1.5.11/doc/manual.xml.head mutt-1.5.11-ro/doc/manual.xml.head
+--- mutt-1.5.11/doc/manual.xml.head    2005-09-06 18:46:44.000000000 +0200
++++ mutt-1.5.11-ro/doc/manual.xml.head 2005-09-27 13:29:11.000000000 +0200
+@@ -4404,6 +4404,205 @@

  
  

-+<sect1>Compressed folders Support (OPTIONAL)
-+<p>
+ </sect1>
+ 
++<sect2 id="compressedfolders">
++<title>Compressed folders Support (OPTIONAL)</title>

 +
 +

++<para>

 +If Mutt was compiled with compressed folders support (by running the
 +If Mutt was compiled with compressed folders support (by running the

-+<em/configure/ script with the <em/--enable-compressed/ flag), Mutt
-+can open folders stored in an arbitrary format, provided that the user
-+has a script to convert from/to this format to one of the accepted.
++<emphasis>configure</emphasis> script with the
++<emphasis>--enable-compressed</emphasis> flag), Mutt can open folders
++stored in an arbitrary format, provided that the user has a script to
++convert from/to this format to one of the accepted.

 +
 +The most common use is to open compressed archived folders e.g. with
 +gzip.
 +
 +The most common use is to open compressed archived folders e.g. with
 +gzip.


@@ -598,143 +596,167 @@ diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head
 +folder to the accepted format, appending to it and converting back to
 +the user-defined format.
 +
 +folder to the accepted format, appending to it and converting back to
 +the user-defined format.
 +

-+There are three hooks defined (<ref id="open-hook" name="open-hook">,
-+<ref id="close-hook" name="close-hook"> and <ref id="append-hook"
-+name="append-hook">) which define commands to uncompress and compress
-+a folder and to append messages to an existing compressed folder 
-+respectively.
++There are three hooks defined (<link
++linkend="open-hook">open-hook</link>, <link
++linkend="close-hook">close-hook</link> and <link
++linkend="append-hook">append-hook</link>) which define commands to
++uncompress and compress a folder and to append messages to an existing
++compressed folder respectively.

 +
 +For example:
 +
 +
 +For example:
 +

-+<tscreen><verb>
++<screen>

 +open-hook \\.gz$ "gzip -cd %f &gt; %t" 
 +close-hook \\.gz$ "gzip -c %t &gt; %f"
 +append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
 +open-hook \\.gz$ "gzip -cd %f &gt; %t" 
 +close-hook \\.gz$ "gzip -c %t &gt; %f"
 +append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 

-+</verb></tscreen>
++</screen>

 +
 +

-+You do not have to specify all of the commands. If you omit <ref
-+id="append-hook" name="append-hook">, the folder will be open and
-+closed again each time you will add to it. If you omit <ref
-+id="close-hook" name="close-hook"> (or give empty command) , the
-+folder will be open in the  mode. If you specify <ref
-+id="append-hook" name="append-hook"> though you'll be able to append
-+to the folder.
++You do not have to specify all of the commands. If you omit <link
++linkend="append-hook">append-hook</link>, the folder will be open and
++closed again each time you will add to it. If you omit <link
++linkend="close-hook">close-hook</link> (or give empty command) , the
++folder will be open in the mode. If you specify <link
++linkend="append-hook">append-hook</link> though you'll be able to
++append to the folder.

 +
 +Note that Mutt will only try to use hooks if the file is not in one of
 +the accepted formats. In particular, if the file is empty, mutt
 +supposes it is not compressed. This is important because it allows the
 +use of programs that do not have well defined extensions. Just use
 +
 +Note that Mutt will only try to use hooks if the file is not in one of
 +the accepted formats. In particular, if the file is empty, mutt
 +supposes it is not compressed. This is important because it allows the
 +use of programs that do not have well defined extensions. Just use

-+&dquot;.&dquot; as a regexp. But this may be surprising if your
-+compressing script produces empty files. In this situation, unset <ref
-+id="save_empty" name="&dollar;save&lowbar;empty">, so that the compressed file
-+will be removed if you delete all of the messages.
++&quot;.&quot; as a regexp. But this may be surprising if your
++compressing script produces empty files. In this situation, unset
++<link linkend="save-empty">&dollar;save&lowbar;empty</link>, so that
++the compressed file will be removed if you delete all of the messages.
++</para>
++
++<sect3 id="open-hook">
++<title>Open a compressed mailbox for reading</title>

 +
 +

-+<sect2>Open a compressed mailbox for reading<label id="open-hook">
-+<p>
-+Usage: <tt/open-hook/ <em/regexp/ &dquot;<em/command/&dquot;
++<para>
++Usage: <literal>open-hook</literal> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;

 +
 +

-+The <em/command/ is the command that can be used for opening the
-+folders whose names match <em/regexp/.
++The <emphasis>command</emphasis> is the command that can be used for
++opening the folders whose names match <emphasis>regexp</emphasis>.

 +
 +

-+The <em/command/ string is the printf-like format string, and it
-+should accept two parameters: &percnt;f, which is replaced with the
-+(compressed) folder name, and &percnt;t which is replaced with the
-+name of the temporary folder to which to write.
++The <emphasis>command</emphasis> string is the printf-like format
++string, and it should accept two parameters: &percnt;f, which is
++replaced with the (compressed) folder name, and &percnt;t which is
++replaced with the name of the temporary folder to which to write.

 +
 +&percnt;f and &percnt;t can be repeated any number of times in the
 +command string, and all of the entries are replaced with the
 +appropriate folder name. In addition, &percnt;&percnt; is replaced by
 +&percnt;, as in printf, and any other &percnt;anything is left as is.
 +
 +
 +&percnt;f and &percnt;t can be repeated any number of times in the
 +command string, and all of the entries are replaced with the
 +appropriate folder name. In addition, &percnt;&percnt; is replaced by
 +&percnt;, as in printf, and any other &percnt;anything is left as is.
 +

-+The <em/command/ should <bf/not/ remove the original compressed file.
-+The <em/command/ should return non-zero exit status if it fails, so
-+mutt knows something's wrong.
++The <emphasis>command</emphasis> should <emphasis
++role="bold">not</emphasis> remove the original compressed file.  The
++<emphasis>command</emphasis> should return non-zero exit status if it
++fails, so mutt knows something's wrong.

 +
 +Example:
 +
 +
 +Example:
 +

-+<tscreen><verb>
++<screen>

 +open-hook \\.gz$ "gzip -cd %f &gt; %t" 
 +open-hook \\.gz$ "gzip -cd %f &gt; %t" 

-+</verb></tscreen>
++</screen>

 +
 +

-+If the <em/command/ is empty, this operation is disabled for this file
-+type.
++If the <emphasis>command</emphasis> is empty, this operation is
++disabled for this file type.
++</para>
++</sect3>

 +
 +

-+<sect2>Write a compressed mailbox<label id="close-hook">
-+<p>
-+Usage: <tt/close-hook/ <em/regexp/ &dquot;<em/command/&dquot;
++<sect3 id="close-hook">
++<title>Write a compressed mailbox</title>

 +
 +

-+This is used to close the folder that was open with the <ref id="open-hook" 
-+name="open-hook"> command after some changes were made to it.
++<para>
++Usage: <literal>close-hook</literal> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;

 +
 +

-+The <em/command/ string is the command that can be used for closing the
-+folders whose names match <em/regexp/. It has the same format as in 
-+the <ref id="open-hook" name="open-hook"> command. Temporary folder
-+in this case is the folder previously produced by the <ref id="open-hook"
-+name="open-hook"> command.
++This is used to close the folder that was open with the <link
++linkend="open-hook">open-hook</link> command after some changes were
++made to it.

 +
 +

-+The <em/command/ should <bf/not/ remove the decompressed file. The
-+<em/command/ should return non-zero exit status if it fails, so mutt
-+knows something's wrong.
++The <emphasis>command</emphasis> string is the command that can be
++used for closing the folders whose names match
++<emphasis>regexp</emphasis>. It has the same format as in the <link
++linkend="open-hook">open-hook</link> command. Temporary folder in this
++case is the folder previously produced by the <link
++linkend="open-hook">open-hook</link> command.
++
++The <emphasis>command</emphasis> should <emphasis
++role="bold">not</emphasis> remove the decompressed file. The
++<emphasis>command</emphasis> should return non-zero exit status if it
++fails, so mutt knows something's wrong.

 +
 +Example:
 +
 +
 +Example:
 +

-+<tscreen><verb>
++<screen>

 +close-hook \\.gz$ "gzip -c %t &gt; %f"
 +close-hook \\.gz$ "gzip -c %t &gt; %f"

-+</verb></tscreen>
++</screen>
++
++If the <emphasis>command</emphasis> is empty, this operation is
++disabled for this file type, and the file can only be open in the
++read-only mode.

 +
 +

-+If the <em/command/ is empty, this operation is disabled for this file
-+type, and the file can only be open in the read-only mode.
++<link linkend="close-hook">close-hook</link> is not called when you
++exit from the folder if the folder was not changed.
++</para>
++</sect3>

 +
 +

-+<ref id="close-hook" name ="close-hook"> is not called when you exit
-+from the folder if the folder was not changed.
++<sect3 id="append-hook">
++<title>Append a message to a compressed mailbox</title>

 +
 +

-+<sect2>Append a message to a compressed mailbox<label id="append-hook">
-+<p>
-+Usage: <tt/append-hook/ <em/regexp/ &dquot;<em/command/&dquot;
++<para>
++Usage: <literal>append-hook</literal> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;

 +
 +

-+This command is used for saving to an existing compressed folder.
-+The <em/command/ is the command that can be used for appending to the
-+folders whose names match <em/regexp/. It has the same format as in 
-+ the <ref id="open-hook" name="open-hook"> command.
-+The temporary folder in this case contains the messages that are being
-+appended. 
++This command is used for saving to an existing compressed folder.  The
++<emphasis>command</emphasis> is the command that can be used for
++appending to the folders whose names match
++<emphasis>regexp</emphasis>. It has the same format as in the <link
++linkend="open-hook">open-hook</link> command.  The temporary folder in
++this case contains the messages that are being appended.

 +
 +

-+The <em/command/ should <bf/not/ remove the decompressed file. The
-+<em/command/ should return non-zero exit status if it fails, so mutt
-+knows something's wrong.
++The <emphasis>command</emphasis> should <emphasis
++role="bold">not</emphasis> remove the decompressed file. The
++<emphasis>command</emphasis> should return non-zero exit status if it
++fails, so mutt knows something's wrong.

 +
 +Example:
 +
 +
 +Example:
 +

-+<tscreen><verb>
++<screen>

 +append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
 +append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 

-+</verb></tscreen>
-+
-+When <ref id="append-hook" name="append-hook"> is used, the folder is
-+not opened, which saves time, but this means that we can not find out
-+what the folder type is. Thus the default (<ref id="mbox_type"
-+name="&dollar;mbox&lowbar;type">) type is always supposed (i.e.
-+this is the format used for the temporary folder).
-+
-+If the file does not exist when you save to it, <ref id="close-hook"
-+name="close-hook"> is called, and not <ref id="append-hook"
-+name="append-hook">. <ref id="append-hook" name="append-hook"> is only
-+for appending to existing folders.
-+
-+If the <em/command/ is empty, this operation is disabled for this file
-+type. In this case, the folder will be open and closed again (using
-+<ref id="open-hook" name="open-hook"> and <ref id="close-hook" 
-+name="close-hook">respectively) each time you will add to it.
-+
-+<sect2>Encrypted folders
-+<p>
++</screen>
++
++When <link linkend="append-hook">append-hook</link> is used, the folder
++is not opened, which saves time, but this means that we can not find
++out what the folder type is. Thus the default (<link
++linkend="mbox-type">&dollar;mbox&lowbar;type</link>) type is always
++supposed (i.e.  this is the format used for the temporary folder).
++
++If the file does not exist when you save to it, <link
++linkend="close-hook">close-hook</link> is called, and not <link
++linkend="append-hook">append-hook</link>. <link
++linkend="append-hook">append-hook</link> is only for appending to
++existing folders.
++
++If the <emphasis>command</emphasis> is empty, this operation is
++disabled for this file type. In this case, the folder will be open and
++closed again (using <link linkend="open-hook">open-hook</link> and
++<link linkend="close-hook">close-hook</link>respectively) each time you
++will add to it.
++</para>
++</sect3>
++
++<sect3>
++<title>Encrypted folders</title>
++
++<para>

 +The compressed folders support can also be used to handle encrypted
 +folders. If you want to encrypt a folder with PGP, you may want to use
 +the following hooks:
 +
 +The compressed folders support can also be used to handle encrypted
 +folders. If you want to encrypt a folder with PGP, you may want to use
 +the following hooks:
 +

-+<tscreen><verb>
++<screen>

 +open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
 +close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"
 +open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
 +close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"

-+</verb></tscreen>
++</screen>

 +
 +Please note, that PGP does not support appending to an encrypted
 +folder, so there is no append-hook defined.
 +
 +Please note, that PGP does not support appending to an encrypted
 +folder, so there is no append-hook defined.


@@ -742,50 +764,24 @@ diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head
 +If you are using GnuPG instead of PGP, you may use the following hooks
 +instead:
 +
 +If you are using GnuPG instead of PGP, you may use the following hooks
 +instead:
 +

-+<tscreen><verb>
++<screen>

 +open-hook  \\.gpg$ "gpg --decrypt &lt; %f &gt; %t"
 +close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId &lt; %t &gt; %f"
 +open-hook  \\.gpg$ "gpg --decrypt &lt; %f &gt; %t"
 +close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId &lt; %t &gt; %f"

-+</verb></tscreen>
-+
-+<bf/Note:/ the folder is temporary stored decrypted in the /tmp
-+directory, where it can be read by your system administrator. So think
-+about the security aspects of this.
-+
- <sect>Mutt's MIME Support
- <p>
- Quite a bit of effort has been made to make Mutt the premier text-mode
-@@ -3156,6 +3326,8 @@
- <item>
- <tt><ref id="alternative_order" name="unalternative&lowbar;order"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
- <item>
-+<tt><ref id="append-hook" name="append-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="auto_view" name="auto&lowbar;view"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
- <item>
- <tt><ref id="auto_view" name="unauto&lowbar;view"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
-@@ -3164,6 +3336,8 @@
- <item>
- <tt><ref id="charset-hook" name="charset-hook"></tt> <em/alias/ <em/charset/
- <item>
-+<tt><ref id="close-hook" name="close-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="color" name="color"></tt> <em/object/ <em/foreground/ <em/background/ &lsqb; <em/regexp/ &rsqb;
- <item>
- <tt><ref id="color" name="uncolor"></tt> <em/index/ <em/pattern/ &lsqb; <em/pattern/ ... &rsqb;
-@@ -3210,6 +3384,8 @@
- <item>
- <tt><ref id="my_hdr" name="unmy&lowbar;hdr"></tt> <em/field/ &lsqb; <em/field/ ... &rsqb;
- <item>
-+<tt><ref id="open-hook" name="open-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="crypt-hook" name="crypt-hook"></tt> <em/pattern/ <em/key-id/
- <item>
- <tt><ref id="push" name="push"></tt> <em/string/
-diff -urN mutt-1.5.10/doc/manual.txt mutt-1.5.10-ro/doc/manual.txt
-diff -urN mutt-1.5.10/doc/muttrc.man mutt-1.5.10-ro/doc/muttrc.man
-diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head
---- mutt-1.5.10/doc/muttrc.man.head    2005-01-15 10:42:45.000000000 +0100
-+++ mutt-1.5.10-ro/doc/muttrc.man.head 2005-08-14 12:10:21.000000000 +0200
++</screen>
++
++<emphasis role="bold">Note:</emphasis> the folder is temporary stored
++decrypted in the /tmp directory, where it can be read by your system
++administrator. So think about the security aspects of this.
++</para>
++</sect3>
++</sect2>
++
+ <sect1 id="mimesupport">
+ <title>Mutt's MIME Support</title>
+ 
+diff -urN mutt-1.5.11/doc/muttrc.man.head mutt-1.5.11-ro/doc/muttrc.man.head
+--- mutt-1.5.11/doc/muttrc.man.head    2005-09-07 10:19:44.000000000 +0200
++++ mutt-1.5.11-ro/doc/muttrc.man.head 2005-09-27 13:29:53.000000000 +0200

 @@ -316,6 +316,24 @@
  to a certain recipient.  The meaning of "key ID" is to be taken
  broadly: This can be a different e-mail address, a numerical key ID,
 @@ -316,6 +316,24 @@
  to a certain recipient.  The meaning of "key ID" is to be taken
  broadly: This can be a different e-mail address, a numerical key ID,


@@ -811,9 +807,9 @@ diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head
  .TP
  \fBpush\fP \fIstring\fP
  This command adds the named \fIstring\fP to the keyboard buffer.
  .TP
  \fBpush\fP \fIstring\fP
  This command adds the named \fIstring\fP to the keyboard buffer.

-diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c
---- mutt-1.5.10/hook.c 2005-02-03 19:47:52.000000000 +0100
-+++ mutt-1.5.10-ro/hook.c      2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/hook.c mutt-1.5.11-ro/hook.c
+--- mutt-1.5.11/hook.c 2005-02-03 19:47:52.000000000 +0100
++++ mutt-1.5.11-ro/hook.c      2005-09-27 13:27:02.000000000 +0200

 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"


@@ -842,10 +838,10 @@ diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c
    else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
             && (!WithCrypto || !(data & M_CRYPTHOOK))
        )
    else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
             && (!WithCrypto || !(data & M_CRYPTHOOK))
        )

-diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h
---- mutt-1.5.10/init.h 2005-08-11 21:37:01.000000000 +0200
-+++ mutt-1.5.10-ro/init.h      2005-08-14 12:10:21.000000000 +0200
-@@ -2979,6 +2979,11 @@
+diff -urN mutt-1.5.11/init.h mutt-1.5.11-ro/init.h
+--- mutt-1.5.11/init.h 2005-09-15 16:19:54.000000000 +0200
++++ mutt-1.5.11-ro/init.h      2005-09-27 13:27:02.000000000 +0200
+@@ -3002,6 +3002,11 @@

    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },
    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },


@@ -857,10 +853,10 @@ diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
  #ifdef HAVE_ICONV
    { "iconv-hook",     mutt_parse_hook,        M_ICONVHOOK }, 
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
  #ifdef HAVE_ICONV
    { "iconv-hook",     mutt_parse_hook,        M_ICONVHOOK }, 

-diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c
---- mutt-1.5.10/main.c 2005-08-11 21:37:01.000000000 +0200
-+++ mutt-1.5.10-ro/main.c      2005-08-14 12:10:21.000000000 +0200
-@@ -382,6 +382,12 @@
+diff -urN mutt-1.5.11/main.c mutt-1.5.11-ro/main.c
+--- mutt-1.5.11/main.c 2005-09-07 10:19:43.000000000 +0200
++++ mutt-1.5.11-ro/main.c      2005-09-27 13:27:02.000000000 +0200
+@@ -385,6 +385,12 @@

  #else
        "-LOCALES_HACK  "
  #endif
  #else
        "-LOCALES_HACK  "
  #endif


@@ -873,9 +869,9 @@ diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c
              
  #ifdef HAVE_WC_FUNCS
        "+HAVE_WC_FUNCS  "
              
  #ifdef HAVE_WC_FUNCS
        "+HAVE_WC_FUNCS  "

-diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am
---- mutt-1.5.10/Makefile.am    2005-08-11 23:27:28.000000000 +0200
-+++ mutt-1.5.10-ro/Makefile.am 2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/Makefile.am mutt-1.5.11-ro/Makefile.am
+--- mutt-1.5.11/Makefile.am    2005-08-11 23:27:28.000000000 +0200
++++ mutt-1.5.11-ro/Makefile.am 2005-09-27 13:27:02.000000000 +0200

 @@ -18,7 +18,7 @@
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
 @@ -18,7 +18,7 @@
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \


@@ -894,10 +890,10 @@ diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am
        attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
        globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
        attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
        globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \

-diff -urN mutt-1.5.10/Makefile.in mutt-1.5.10-ro/Makefile.in
-diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c
---- mutt-1.5.10/mbox.c 2005-08-02 09:08:00.000000000 +0200
-+++ mutt-1.5.10-ro/mbox.c      2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/Makefile.in mutt-1.5.11-ro/Makefile.in
+diff -urN mutt-1.5.11/mbox.c mutt-1.5.11-ro/mbox.c
+--- mutt-1.5.11/mbox.c 2005-08-02 09:08:00.000000000 +0200
++++ mutt-1.5.11-ro/mbox.c      2005-09-27 13:27:02.000000000 +0200

 @@ -28,6 +28,10 @@
  #include "sort.h"
  #include "copy.h"
 @@ -28,6 +28,10 @@
  #include "sort.h"
  #include "copy.h"


@@ -922,10 +918,10 @@ diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c
    mutt_unblock_signals ();
    mx_fastclose_mailbox (ctx);
    return 0;
    mutt_unblock_signals ();
    mx_fastclose_mailbox (ctx);
    return 0;

-diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h
---- mutt-1.5.10/mutt.h 2005-08-11 21:37:23.000000000 +0200
-+++ mutt-1.5.10-ro/mutt.h      2005-08-14 12:10:21.000000000 +0200
-@@ -161,6 +161,11 @@
+diff -urN mutt-1.5.11/mutt.h mutt-1.5.11-ro/mutt.h
+--- mutt-1.5.11/mutt.h 2005-09-07 10:19:43.000000000 +0200
++++ mutt-1.5.11-ro/mutt.h      2005-09-27 13:27:02.000000000 +0200
+@@ -157,6 +157,11 @@

  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)
  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)


@@ -937,7 +933,7 @@ diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1

-@@ -829,6 +834,11 @@
+@@ -828,6 +833,11 @@

    void *data;                 /* driver specific data */
  #endif /* USE_IMAP */
  
    void *data;                 /* driver specific data */
  #endif /* USE_IMAP */
  


@@ -949,12 +945,12 @@ diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h
    short magic;                        /* mailbox type */
  
    unsigned int locked : 1;    /* is the mailbox locked? */
    short magic;                        /* mailbox type */
  
    unsigned int locked : 1;    /* is the mailbox locked? */

-diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc
-diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head
-diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in
-diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c
---- mutt-1.5.10/mx.c   2005-08-02 09:08:01.000000000 +0200
-+++ mutt-1.5.10-ro/mx.c        2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/Muttrc mutt-1.5.11-ro/Muttrc
+diff -urN mutt-1.5.11/Muttrc.head mutt-1.5.11-ro/Muttrc.head
+diff -urN mutt-1.5.11/Muttrc.head.in mutt-1.5.11-ro/Muttrc.head.in
+diff -urN mutt-1.5.11/mx.c mutt-1.5.11-ro/mx.c
+--- mutt-1.5.11/mx.c   2005-09-07 10:19:43.000000000 +0200
++++ mutt-1.5.11-ro/mx.c        2005-09-27 13:27:02.000000000 +0200

 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"


@@ -1053,9 +1049,9 @@ diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c
    if (ctx)
    {
      if (ctx->locked) lock = 0;
    if (ctx)
    {
      if (ctx->locked) lock = 0;

-diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h
---- mutt-1.5.10/mx.h   2003-08-05 15:58:16.000000000 +0200
-+++ mutt-1.5.10-ro/mx.h        2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/mx.h mutt-1.5.11-ro/mx.h
+--- mutt-1.5.11/mx.h   2003-08-05 15:58:16.000000000 +0200
++++ mutt-1.5.11-ro/mx.h        2005-09-27 13:27:02.000000000 +0200

 @@ -40,6 +40,9 @@
  #ifdef USE_POP
    , M_POP
 @@ -40,6 +40,9 @@
  #ifdef USE_POP
    , M_POP


@@ -1066,17 +1062,17 @@ diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);

-diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES
---- mutt-1.5.10/PATCHES        2005-08-11 23:27:30.000000000 +0200
-+++ mutt-1.5.10-ro/PATCHES     2005-08-14 12:10:35.000000000 +0200
+diff -urN mutt-1.5.11/PATCHES mutt-1.5.11-ro/PATCHES
+--- mutt-1.5.11/PATCHES        2005-08-15 10:16:00.000000000 +0200
++++ mutt-1.5.11-ro/PATCHES     2005-09-27 13:30:25.000000000 +0200

 @@ -0,0 +1 @@
 @@ -0,0 +1 @@

-+patch-1.5.10.rr.compressed.1
-diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
---- mutt-1.5.10/po/de.po       2005-08-11 23:50:35.000000000 +0200
-+++ mutt-1.5.10-ro/po/de.po    2005-08-14 12:12:20.000000000 +0200
-@@ -1281,6 +1281,48 @@
++patch-1.5.11.rr.compressed.1
+diff -urN mutt-1.5.11/po/de.po mutt-1.5.11-ro/po/de.po
+--- mutt-1.5.11/po/de.po       2005-09-15 16:23:50.000000000 +0200
++++ mutt-1.5.11-ro/po/de.po    2005-09-27 13:27:02.000000000 +0200
+@@ -1262,6 +1262,48 @@

  msgid "Failed to figure out sender"
  msgid "Failed to figure out sender"

- msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
+ msgstr "Kann Absender nicht ermitteln"

  
 +#: compress.c:203 mbox.c:661
 +msgid "Mailbox was corrupted!"
  
 +#: compress.c:203 mbox.c:661
 +msgid "Mailbox was corrupted!"


@@ -1123,7 +1119,7 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
  #: crypt.c:69
  #, c-format
  msgid " (current time: %c)"
  #: crypt.c:69
  #, c-format
  msgid " (current time: %c)"

-@@ -1901,6 +1943,10 @@
+@@ -1882,6 +1924,10 @@

  msgid "Help for %s"
  msgstr "Hilfe für %s"
  
  msgid "Help for %s"
  msgstr "Hilfe für %s"
  


@@ -1134,7 +1130,7 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
  #: hook.c:246
  #, c-format
  msgid "unhook: Can't do unhook * from within a hook."
  #: hook.c:246
  #, c-format
  msgid "unhook: Can't do unhook * from within a hook."

-@@ -3383,18 +3429,10 @@
+@@ -3336,18 +3382,10 @@

  msgid "Mailbox is corrupt!"
  msgstr "Mailbox fehlerhaft!"
  
  msgid "Mailbox is corrupt!"
  msgstr "Mailbox fehlerhaft!"
  


@@ -1153,9 +1149,9 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
  #. this means ctx->changed or ctx->deleted was set, but no
  #. * messages were found to be changed or deleted.  This should
  #. * never happen, is we presume it is a bug in mutt.
  #. this means ctx->changed or ctx->deleted was set, but no
  #. * messages were found to be changed or deleted.  This should
  #. * never happen, is we presume it is a bug in mutt.

-diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in
---- mutt-1.5.10/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200
-+++ mutt-1.5.10-ro/po/POTFILES.in      2005-08-14 12:13:18.000000000 +0200
+diff -urN mutt-1.5.11/po/POTFILES.in mutt-1.5.11-ro/po/POTFILES.in
+--- mutt-1.5.11/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200
++++ mutt-1.5.11-ro/po/POTFILES.in      2005-09-27 13:27:02.000000000 +0200

 @@ -8,6 +8,7 @@
  color.c
  commands.c
 @@ -8,6 +8,7 @@
  color.c
  commands.c


@@ -1164,9 +1160,9 @@ diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in
  crypt-gpgme.c
  crypt.c
  cryptglue.c
  crypt-gpgme.c
  crypt.c
  cryptglue.c

-diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c
---- mutt-1.5.10/status.c       2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.10-ro/status.c    2005-08-14 12:10:21.000000000 +0200
+diff -urN mutt-1.5.11/status.c mutt-1.5.11-ro/status.c
+--- mutt-1.5.11/status.c       2005-02-03 19:47:53.000000000 +0100
++++ mutt-1.5.11-ro/status.c    2005-09-27 13:27:02.000000000 +0200

 @@ -97,6 +97,14 @@
  
      case 'f':
 @@ -97,6 +97,14 @@
  
      case 'f':