mirror of
https://git.freebsd.org/ports.git
synced 2025-07-16 16:59:17 -04:00
c6f96f0fab
- remove some context from the extra-patches so that they still apply if QUOTE_PATCH is not selected. PR: 233993 Submitted by: mjl@luckie.org.nz Approved by: dereks@lifeofadishwasher.com (maintainer)
77 lines
2.3 KiB
Text
77 lines
2.3 KiB
Text
--- PATCHES.orig 2018-11-29 22:49:51 UTC
|
|
+++ PATCHES
|
|
@@ -0,0 +1 @@
|
|
+patch-1.5.4.cd.ifdef.1
|
|
--- init.c.orig 2018-11-24 19:06:11 UTC
|
|
+++ init.c
|
|
@@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table
|
|
return t;
|
|
}
|
|
|
|
+static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
|
|
+{
|
|
+ int i, j, res = 0;
|
|
+ BUFFER token;
|
|
+
|
|
+ memset (&token, 0, sizeof (token));
|
|
+ mutt_extract_token (tmp, s, 0);
|
|
+
|
|
+ /* is the item defined as a variable or a function? */
|
|
+ if (!(res = (mutt_option_index (tmp->data) != -1)))
|
|
+ for (i = 0; !res && i < MENU_MAX; i++)
|
|
+ {
|
|
+ struct binding_t *b = km_get_table (Menus[i].value);
|
|
+
|
|
+ if (!b)
|
|
+ continue;
|
|
+
|
|
+ for (j = 0; b[j].name; j++)
|
|
+ if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data))
|
|
+ && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data)))
|
|
+ {
|
|
+ res = 1;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (!MoreArgs (s))
|
|
+ {
|
|
+ snprintf (err->data, err->dsize, _("ifdef: too few arguments"));
|
|
+ return (-1);
|
|
+ }
|
|
+ mutt_extract_token (tmp, s, MUTT_TOKEN_SPACE);
|
|
+
|
|
+ if (res)
|
|
+ {
|
|
+ if (mutt_parse_rc_line (tmp->data, &token, err) == -1)
|
|
+ {
|
|
+ mutt_error ("Erreur: %s", err->data);
|
|
+ FREE (&token.data);
|
|
+ return (-1);
|
|
+ }
|
|
+ FREE (&token.data);
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
|
|
{
|
|
do
|
|
--- init.h.orig 2018-11-29 22:49:51 UTC
|
|
+++ init.h
|
|
@@ -4195,6 +4195,7 @@ static int parse_lists (BUFFER *, 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 *);
|
|
+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
|
|
static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
|
|
static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
|
|
static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
|
|
@@ -4259,6 +4260,7 @@ const struct command_t Commands[] = {
|
|
{ "hdr_order", parse_list, UL &HeaderOrderList },
|
|
#ifdef HAVE_ICONV
|
|
{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },
|
|
+ { "ifdef", parse_ifdef, 0 },
|
|
#endif
|
|
{ "ignore", parse_ignore, 0 },
|
|
{ "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK },
|