X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/3799c7942e787a60a5b990d87f7f58208d5ec08e..c5b192a33a305c26dfc056daa813c9a5d435da43:/debian/patches/features/ifdef?ds=sidebyside

diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef
index 38dff3a..771d8b0 100644
--- a/debian/patches/features/ifdef
+++ b/debian/patches/features/ifdef
@@ -26,12 +26,10 @@ ifdef  trash  set trash=~/Mail/trash
   - Use mutt_strcmp in favor of ascii_strncasecmp to compare strings.
 
 == END PATCH
-Index: mutt/init.c
-===================================================================
---- mutt.orig/init.c	2006-12-12 14:15:03.000000000 +0100
-+++ mutt/init.c	2007-02-15 23:38:45.597907432 +0100
-@@ -624,6 +624,65 @@ static int remove_from_rx_list (RX_LIST 
-   return (rv);
+--- a/init.c
++++ b/init.c
+@@ -601,6 +601,65 @@
+   }
  }
  
 +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
@@ -96,11 +94,9 @@ Index: mutt/init.c
  static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
  {
    do
-Index: mutt/init.h
-===================================================================
---- mutt.orig/init.h	2006-12-12 14:15:03.000000000 +0100
-+++ mutt/init.h	2007-02-15 23:26:21.160079184 +0100
-@@ -3017,6 +3017,7 @@ static int parse_lists (BUFFER *, BUFFER
+--- a/init.h
++++ b/init.h
+@@ -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 *);
@@ -108,31 +104,23 @@ Index: mutt/init.h
  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 *);
-@@ -3068,6 +3069,7 @@ struct command_t Commands[] = {
-   { "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
-   { "iconv-hook",	mutt_parse_hook,	M_ICONVHOOK }, 
+   { "iconv-hook",	mutt_parse_hook,	M_ICONVHOOK },
  #endif
-Index: mutt/PATCHES
-===================================================================
---- mutt/PATCHES.orig	2007-02-15 21:48:09.131803632 +0100
-+++ mutt/PATCHES	2007-02-15 21:48:09.131803632 +0100
-@@ -0,0 +1 @@
-+patch-1.5.13.cd.ifdef.2
-Index: mutt/doc/manual.xml.head
-===================================================================
---- mutt.orig/doc/manual.xml.head	2007-02-15 21:53:09.312169280 +0100
-+++ mutt/doc/manual.xml.head	2007-02-15 23:42:23.875724160 +0100
-@@ -3091,6 +3091,28 @@ considered to be an executable program f
+--- a/doc/manual.xml.head
++++ b/doc/manual.xml.head
+@@ -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>
@@ -153,5 +141,5 @@ Index: mutt/doc/manual.xml.head
 +</sect1>
 +
  <sect1 id="unhook">
- <title>Removing hooks</title>
+ <title>Removing Hooks</title>