Remove maildir-mtime patch, upstream has a different implementation (though with...

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

diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef
index 1463d4bed393d0cb1e9f27e003b26b14db409791..d22740ef19ae7d63e00b67050d5b19256c5fe659 100644 (file)
--- a/debian/patches/features/ifdef
+++ b/debian/patches/features/ifdef
@@ -96,7 +96,7 @@ ifdef  trash  set trash=~/Mail/trash
    do
 --- a/init.h
 +++ b/init.h
    do
 --- a/init.h
 +++ b/init.h

-@@ -3351,6 +3351,7 @@
+@@ -3413,6 +3413,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 *);
  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,17 +104,17 @@ 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 *);
  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 *);

-@@ -3401,6 +3402,7 @@
+@@ -3463,6 +3464,7 @@

    { "group",          parse_group,            0 },
    { "ungroup",                parse_ungroup,          0 },
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 +  { "ifdef",          parse_ifdef,            0 },
  #ifdef HAVE_ICONV
    { "group",          parse_group,            0 },
    { "ungroup",                parse_ungroup,          0 },
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 +  { "ifdef",          parse_ifdef,            0 },
  #ifdef HAVE_ICONV

-   { "iconv-hook",     mutt_parse_hook,        M_ICONVHOOK }, 
+   { "iconv-hook",     mutt_parse_hook,        M_ICONVHOOK },

  #endif
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
  #endif
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head

-@@ -3816,6 +3816,28 @@
+@@ -4087,6 +4087,28 @@

  
  </sect1>
  
  
  </sect1>
  


@@ -141,7 +141,7 @@ ifdef  trash  set trash=~/Mail/trash
 +</sect1>
 +
  <sect1 id="unhook">
 +</sect1>
 +
  <sect1 id="unhook">

- <title>Removing hooks</title>
+ <title>Removing Hooks</title>

  
 --- /dev/null
 +++ b/PATCHES
  
 --- /dev/null
 +++ b/PATCHES