removing patches that were applied usptream into 1.5.21

[software/mutt-debian.git] / debian / patches / features / ifdef

diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef
index d22740ef19ae7d63e00b67050d5b19256c5fe659..771d8b062a9bc6702716ca0ad8edc266d7100fd9 100644 (file)
--- a/debian/patches/features/ifdef
+++ b/debian/patches/features/ifdef
@@ -28,8 +28,8 @@ ifdef  trash  set trash=~/Mail/trash
 == END PATCH
 --- a/init.c
 +++ b/init.c
-@@ -635,6 +635,65 @@
-   return (rv);
+@@ -601,6 +601,65 @@
+   }
  }
  
 +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
@@ -96,7 +96,7 @@ ifdef  trash  set trash=~/Mail/trash
    do
 --- a/init.h
 +++ b/init.h
-@@ -3413,6 +3413,7 @@
+@@ -3439,6 +3439,7 @@
  static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -104,9 +104,9 @@ ifdef  trash  set trash=~/Mail/trash
  static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -3463,6 +3464,7 @@
-   { "group",          parse_group,            0 },
-   { "ungroup",                parse_ungroup,          0 },
+@@ -3489,6 +3490,7 @@
+   { "group",          parse_group,            M_GROUP },
+   { "ungroup",                parse_group,            M_UNGROUP },
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 +  { "ifdef",          parse_ifdef,            0 },
  #ifdef HAVE_ICONV
@@ -114,13 +114,13 @@ ifdef  trash  set trash=~/Mail/trash
  #endif
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
-@@ -4087,6 +4087,28 @@
+@@ -4373,6 +4373,28 @@
  
  </sect1>
  
 +<sect1 id="ifdef">
 +
-+<title>Configuring features conditionnaly</title>
++<title>Configuring features conditionally</title>
 +
 +<para>
 +Usage: <literal>ifdef</literal> <emphasis>item</emphasis> <emphasis>command</emphasis>
@@ -143,7 +143,3 @@ ifdef  trash  set trash=~/Mail/trash
  <sect1 id="unhook">
  <title>Removing Hooks</title>
  
---- /dev/null
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.13.cd.ifdef.2