upstream/393926-internal-viewer.patch: revert the patch and add the auto_view of...

[software/mutt-debian.git] / debian / patches / upstream / 530661-mandatory-doubledash.patch

diff --git a/debian/patches/upstream/530661-mandatory-doubledash.patch b/debian/patches/upstream/530661-mandatory-doubledash.patch
index a7cb468e0558227cc2832928175a3bc5da65dc0f..802b82e550f8bca1bafbd7df22487938c276ab12 100644 (file)
--- a/debian/patches/upstream/530661-mandatory-doubledash.patch
+++ b/debian/patches/upstream/530661-mandatory-doubledash.patch
@@ -14,7 +14,7 @@ to make -- mandatory
 -To attach multiple files, separating filenames and recipient addresses with
 -"\-\-" is mandatory, e.g. \fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
 +When attaching single or multiple files, separating filenames and recipient addresses with
-+"\-\-" is mandatory, e.g. \fBmutt -a image.jpg \-\- addr1\fP or
++"\-\-" is mandatory, e.g. \fBmutt \-a image.jpg \-\- addr1\fP or
 +\fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
 +The \-a option must be placed at the end of command line options.
  .IP "-b \fIaddress\fP"
@@ -32,18 +32,23 @@ to make -- mandatory
  <arg choice="opt"><option>-c</option>
  <replaceable>address</replaceable>
  </arg>
-@@ -7011,9 +7008,12 @@
- <arg choice="opt" rep="repeat">
- <replaceable>file</replaceable>
+@@ -7008,15 +7005,12 @@
+ <replaceable>subject</replaceable>
  </arg>
--<arg choice="plain">--</arg>
-+<arg choice="opt"><option>-a</option>
-+<replaceable>file</replaceable>
+ <arg choice="opt">
+-<arg choice="opt" rep="repeat">
++<option>-a</option>
+ <replaceable>file</replaceable>
 +<arg choice="opt" rep="repeat"/>
 +--
  </arg>
+-<arg choice="plain">--</arg>
+-</arg>
 -<arg choice="plain">
+-<replaceable>address</replaceable>
+-</arg>
+-<arg choice="opt" rep="repeat">
 +<arg choice="plain" rep="repeat">
  <replaceable>address</replaceable>
  </arg>
- <arg choice="opt" rep="repeat">
+ </cmdsynopsis>