use MUTT_TOKEN_NO_FLAGS

diff --git a/color.c b/color.c
index 7625cb343551c9fa45c3fc669a638e725bbfa981..01393b5d91c27981d2a74ed4c63983100cb15e17 100644 (file)
--- a/color.c
+++ b/color.c
@@ -575,7 +575,7 @@ static void do_uncolor(struct Buffer *buf, struct Buffer *s,
   struct ColorLine *np = NULL, *tmp = NULL;
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (mutt_str_strcmp("*", buf->data) == 0)
     {
       np = STAILQ_FIRST(cl);
@@ -636,7 +636,7 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
   int object = 0;
   bool do_cache = false;
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   object = mutt_map_get_value(buf->data, Fields);
   if (object == -1)
@@ -682,7 +682,7 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
   {
     /* just eat the command, but don't do anything real about it */
     do
-      mutt_extract_token(buf, s, 0);
+      mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     while (MoreArgs(s));
 
     return MUTT_CMD_SUCCESS;
@@ -870,7 +870,7 @@ static int parse_object(struct Buffer *buf, struct Buffer *s, uint32_t *o,
     return -1;
   }
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (mutt_str_startswith(buf->data, "quoted", CASE_MATCH))
   {
     if (buf->data[6])
@@ -896,7 +896,7 @@ static int parse_object(struct Buffer *buf, struct Buffer *s, uint32_t *o,
       return -1;
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     *o = mutt_map_get_value(buf->data, ComposeFields);
     if (*o == -1)
@@ -944,7 +944,7 @@ static int parse_color_pair(struct Buffer *buf, struct Buffer *s, uint32_t *fg,
       return -1;
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (mutt_str_strcasecmp("bold", buf->data) == 0)
       *attr |= A_BOLD;
@@ -972,7 +972,7 @@ static int parse_color_pair(struct Buffer *buf, struct Buffer *s, uint32_t *fg,
     return -1;
   }
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   if (parse_color_name(buf->data, bg, attr, false, err) != 0)
     return -1;
@@ -999,7 +999,7 @@ static int parse_attr_spec(struct Buffer *buf, struct Buffer *s, uint32_t *fg,
     return -1;
   }
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   if (mutt_str_strcasecmp("bold", buf->data) == 0)
     *attr |= A_BOLD;
@@ -1079,7 +1079,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
       return MUTT_CMD_WARNING;
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   }
 
   if (MoreArgs(s) && (object != MT_COLOR_STATUS))
@@ -1125,12 +1125,12 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
      * 0 arguments: sets the default status color (handled below by else part)
      * 1 argument : colorize pattern on match
      * 2 arguments: colorize nth submatch of pattern */
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (MoreArgs(s))
     {
       struct Buffer temporary = { 0 };
-      mutt_extract_token(&temporary, s, 0);
+      mutt_extract_token(&temporary, s, MUTT_TOKEN_NO_FLAGS);
       match = atoi(temporary.data);
       FREE(&temporary.data);
     }

diff --git a/hook.c b/hook.c
index 40b8155486b5aa8b14e0f3f9c398f0b78d9dcba2..c21a9d77624c3e769b01c77ce643678726c4b291 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -101,7 +101,7 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
       not = true;
     }
 
-    mutt_extract_token(&pattern, s, 0);
+    mutt_extract_token(&pattern, s, MUTT_TOKEN_NO_FLAGS);
 
     if (!MoreArgs(s))
     {
@@ -329,7 +329,7 @@ enum CommandResult mutt_parse_unhook(struct Buffer *buf, struct Buffer *s,
 {
   while (MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (mutt_str_strcmp("*", buf->data) == 0)
     {
       if (current_hook_type)

diff --git a/icommands.c b/icommands.c
index 5cbd515194eb8588737abfbde576a6efb042c45e..d748f7c6412ce8a2af99094ab336480bb9f7d1c6 100644 (file)
--- a/icommands.c
+++ b/icommands.c
@@ -84,7 +84,7 @@ enum CommandResult mutt_parse_icommand(/* const */ char *line, struct Buffer *er
   SKIPWS(expn.dptr);
   while (*expn.dptr)
   {
-    mutt_extract_token(&token, &expn, 0);
+    mutt_extract_token(&token, &expn, MUTT_TOKEN_NO_FLAGS);
     for (size_t i = 0; ICommandList[i].name; i++)
     {
       if (mutt_str_strcmp(token.data, ICommandList[i].name) != 0)
@@ -235,7 +235,7 @@ static enum CommandResult icmd_bind(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
     dump_all = true;
   else
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   if (MoreArgs(s))
   {

diff --git a/init.c b/init.c
index 93f4b6bc570ad5217db7ea9b7d428b739c1e1ba8..2a0f4c3419b877e82a29183b035e7989722a7856 100644 (file)
--- a/init.c
+++ b/init.c
@@ -473,7 +473,7 @@ static enum CommandResult parse_attach_list(struct Buffer *buf, struct Buffer *s
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (!buf->data || (*buf->data == '\0'))
       continue;
@@ -550,7 +550,7 @@ static int parse_grouplist(struct GroupList *ctx, struct Buffer *buf,
       goto bail;
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     mutt_grouplist_add(ctx, mutt_pattern_group(buf->data));
 
@@ -560,7 +560,7 @@ static int parse_grouplist(struct GroupList *ctx, struct Buffer *buf,
       goto bail;
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   }
 
   return 0;
@@ -584,7 +584,7 @@ static enum CommandResult parse_replace_list(struct Buffer *buf, struct Buffer *
     mutt_buffer_printf(err, _("%s: too few arguments"), "subjectrx");
     return MUTT_CMD_WARNING;
   }
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   /* Second token is a replacement template */
   if (!MoreArgs(s))
@@ -592,7 +592,7 @@ static enum CommandResult parse_replace_list(struct Buffer *buf, struct Buffer *
     mutt_buffer_printf(err, _("%s: too few arguments"), "subjectrx");
     return MUTT_CMD_WARNING;
   }
-  mutt_extract_token(&templ, s, 0);
+  mutt_extract_token(&templ, s, MUTT_TOKEN_NO_FLAGS);
 
   if (mutt_replacelist_add(list, buf->data, templ.data, err) != 0)
   {
@@ -621,7 +621,7 @@ static enum CommandResult parse_unattach_list(struct Buffer *buf, struct Buffer
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     FREE(&tmp);
 
     if (mutt_str_strcasecmp(buf->data, "any") == 0)
@@ -682,7 +682,7 @@ static enum CommandResult parse_unreplace_list(struct Buffer *buf, struct Buffer
     return MUTT_CMD_WARNING;
   }
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   /* "*" is a special case. */
   if (mutt_str_strcmp(buf->data, "*") == 0)
@@ -900,7 +900,7 @@ static enum CommandResult parse_alias(struct Buffer *buf, struct Buffer *s,
     return MUTT_CMD_WARNING;
   }
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   if (parse_grouplist(&gc, buf, s, data, err) == -1)
     return MUTT_CMD_ERROR;
@@ -977,7 +977,7 @@ static enum CommandResult parse_alternates(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (parse_grouplist(&gc, buf, s, data, err) == -1)
       goto bail;
@@ -1008,7 +1008,7 @@ static enum CommandResult parse_attachments(struct Buffer *buf, struct Buffer *s
   char op, *category = NULL;
   struct ListHead *head = NULL;
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (!buf->data || (*buf->data == '\0'))
   {
     mutt_buffer_strcpy(err, _("attachments: no disposition"));
@@ -1070,7 +1070,7 @@ static enum CommandResult parse_echo(struct Buffer *buf, struct Buffer *s,
     mutt_buffer_printf(err, _("%s: too few arguments"), "echo");
     return MUTT_CMD_WARNING;
   }
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   OptForceRefresh = true;
   mutt_message("%s", buf->data);
   OptForceRefresh = false;
@@ -1110,7 +1110,7 @@ static enum CommandResult parse_group(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (parse_grouplist(&gc, buf, s, data, err) == -1)
       goto bail;
 
@@ -1223,7 +1223,7 @@ static enum CommandResult parse_ifdef(struct Buffer *buf, struct Buffer *s,
 {
   struct Buffer token = { 0 };
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   // is the item defined as:
   bool res = cs_get_elem(Config, buf->data) // a variable?
@@ -1264,7 +1264,7 @@ static enum CommandResult parse_ignore(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     remove_from_stailq(&UnIgnore, buf->data);
     add_to_stailq(&Ignore, buf->data);
   } while (MoreArgs(s));
@@ -1282,7 +1282,7 @@ static enum CommandResult parse_lists(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (parse_grouplist(&gc, buf, s, data, err) == -1)
       goto bail;
@@ -1318,7 +1318,7 @@ static enum CommandResult parse_mailboxes(struct Buffer *buf, struct Buffer *s,
 
     if (data & MUTT_NAMED)
     {
-      mutt_extract_token(buf, s, 0);
+      mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
       if (buf->data && (*buf->data != '\0'))
       {
         m->desc = mutt_str_strdup(buf->data);
@@ -1330,7 +1330,7 @@ static enum CommandResult parse_mailboxes(struct Buffer *buf, struct Buffer *s,
       }
     }
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (mutt_buffer_is_empty(buf))
     {
       /* Skip empty tokens. */
@@ -1445,7 +1445,7 @@ static enum CommandResult parse_path_list(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     mutt_str_strfcpy(path, buf->data, sizeof(path));
     mutt_expand_path(path, sizeof(path));
     add_to_stailq((struct ListHead *) data, path);
@@ -1466,7 +1466,7 @@ static enum CommandResult parse_path_unlist(struct Buffer *buf, struct Buffer *s
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     /* Check for deletion of entire list */
     if (mutt_str_strcmp(buf->data, "*") == 0)
     {
@@ -1890,7 +1890,7 @@ static enum CommandResult parse_setenv(struct Buffer *buf, struct Buffer *s,
   }
 
   char *name = mutt_str_strdup(buf->data);
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   mutt_envlist_set(name, buf->data, true);
   FREE(&name);
 
@@ -1907,7 +1907,7 @@ static enum CommandResult parse_source(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    if (mutt_extract_token(buf, s, 0) != 0)
+    if (mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS) != 0)
     {
       mutt_buffer_printf(err, _("source: error at %s"), s->dptr);
       return MUTT_CMD_ERROR;
@@ -1947,7 +1947,7 @@ static enum CommandResult parse_spam_list(struct Buffer *buf, struct Buffer *s,
   }
 
   /* Extract the first token, a regex */
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
   /* data should be either MUTT_SPAM or MUTT_NOSPAM. MUTT_SPAM is for spam commands. */
   if (data == MUTT_SPAM)
@@ -1955,7 +1955,7 @@ static enum CommandResult parse_spam_list(struct Buffer *buf, struct Buffer *s,
     /* If there's a second parameter, it's a template for the spam tag. */
     if (MoreArgs(s))
     {
-      mutt_extract_token(&templ, s, 0);
+      mutt_extract_token(&templ, s, MUTT_TOKEN_NO_FLAGS);
 
       /* Add to the spam list. */
       if (mutt_replacelist_add(&SpamList, buf->data, templ.data, err) != 0)
@@ -2012,7 +2012,7 @@ static enum CommandResult parse_stailq(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     add_to_stailq((struct ListHead *) data, buf->data);
   } while (MoreArgs(s));
 
@@ -2043,7 +2043,7 @@ static enum CommandResult parse_subscribe(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (parse_grouplist(&gc, buf, s, data, err) == -1)
       goto bail;
@@ -2085,7 +2085,7 @@ static enum CommandResult parse_subscribe_to(struct Buffer *buf, struct Buffer *
 
   if (MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (MoreArgs(s))
     {
@@ -2134,13 +2134,13 @@ static enum CommandResult parse_tag_formats(struct Buffer *buf, struct Buffer *s
   {
     char *tag = NULL, *format = NULL;
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (buf->data && (*buf->data != '\0'))
       tag = mutt_str_strdup(buf->data);
     else
       continue;
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     format = mutt_str_strdup(buf->data);
 
     /* avoid duplicates */
@@ -2173,13 +2173,13 @@ static enum CommandResult parse_tag_transforms(struct Buffer *buf, struct Buffer
   {
     char *tag = NULL, *transform = NULL;
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (buf->data && (*buf->data != '\0'))
       tag = mutt_str_strdup(buf->data);
     else
       continue;
 
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     transform = mutt_str_strdup(buf->data);
 
     /* avoid duplicates */
@@ -2207,7 +2207,7 @@ static enum CommandResult parse_unalias(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (mutt_str_strcmp("*", buf->data) == 0)
     {
@@ -2256,7 +2256,7 @@ static enum CommandResult parse_unalternates(struct Buffer *buf, struct Buffer *
   alternates_clean();
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     mutt_regexlist_remove(&Alternates, buf->data);
 
     if ((mutt_str_strcmp(buf->data, "*") != 0) &&
@@ -2279,7 +2279,7 @@ static enum CommandResult parse_unattachments(struct Buffer *buf, struct Buffer
   char op, *p = NULL;
   struct ListHead *head = NULL;
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (!buf->data || (*buf->data == '\0'))
   {
     mutt_buffer_strcpy(err, _("unattachments: no disposition"));
@@ -2324,7 +2324,7 @@ static enum CommandResult parse_unignore(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     /* don't add "*" to the unignore list */
     if (strcmp(buf->data, "*") != 0)
@@ -2345,7 +2345,7 @@ static enum CommandResult parse_unlists(struct Buffer *buf, struct Buffer *s,
   mutt_hash_free(&AutoSubscribeCache);
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     mutt_regexlist_remove(&SubscribedLists, buf->data);
     mutt_regexlist_remove(&MailLists, buf->data);
 
@@ -2373,7 +2373,7 @@ static enum CommandResult parse_unmailboxes(struct Buffer *buf, struct Buffer *s
 
   while (!clear_all && MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (mutt_str_strcmp(buf->data, "*") == 0)
     {
@@ -2440,7 +2440,7 @@ static enum CommandResult parse_unmy_hdr(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (mutt_str_strcmp("*", buf->data) == 0)
     {
       mutt_list_free(&UserHeader);
@@ -2474,7 +2474,7 @@ static enum CommandResult parse_unstailq(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     /* Check for deletion of entire list */
     if (mutt_str_strcmp(buf->data, "*") == 0)
     {
@@ -2510,7 +2510,7 @@ static enum CommandResult parse_unsubscribe(struct Buffer *buf, struct Buffer *s
   mutt_hash_free(&AutoSubscribeCache);
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     mutt_regexlist_remove(&SubscribedLists, buf->data);
 
     if ((mutt_str_strcmp(buf->data, "*") != 0) &&
@@ -2539,7 +2539,7 @@ static enum CommandResult parse_unsubscribe_from(struct Buffer *buf, struct Buff
 
   if (MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (MoreArgs(s))
     {
@@ -3280,7 +3280,7 @@ enum CommandResult mutt_parse_rc_line(/* const */ char *line,
       expn.dptr++;
       continue;
     }
-    mutt_extract_token(token, &expn, 0);
+    mutt_extract_token(token, &expn, MUTT_TOKEN_NO_FLAGS);
     for (i = 0; Commands[i].name; i++)
     {
       if (mutt_str_strcmp(token->data, Commands[i].name) == 0)

diff --git a/keymap.c b/keymap.c
index f382e0257c9d563c419b2389340db894644175b3..260e8b67dd96b4a3148b45d0e0176cb51279cf29 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -1127,7 +1127,7 @@ static char *parse_keymap(int *menu, struct Buffer *s, int maxmenus,
   mutt_buffer_init(&buf);
 
   /* menu name */
-  mutt_extract_token(&buf, s, 0);
+  mutt_extract_token(&buf, s, MUTT_TOKEN_NO_FLAGS);
   char *p = buf.data;
   if (MoreArgs(s))
   {
@@ -1151,7 +1151,7 @@ static char *parse_keymap(int *menu, struct Buffer *s, int maxmenus,
     }
     *nummenus = i;
     /* key sequence */
-    mutt_extract_token(&buf, s, 0);
+    mutt_extract_token(&buf, s, MUTT_TOKEN_NO_FLAGS);
 
     if (buf.data[0] == '\0')
     {
@@ -1260,7 +1260,7 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s,
     return MUTT_CMD_ERROR;
 
   /* function to execute */
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), "bind");
@@ -1394,7 +1394,7 @@ enum CommandResult mutt_parse_unbind(struct Buffer *buf, struct Buffer *s,
   bool all_keys = false;
   char *key = NULL;
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (mutt_str_strcmp(buf->data, "*") == 0)
   {
     for (int i = 0; i < MENU_MAX; i++)
@@ -1405,7 +1405,7 @@ enum CommandResult mutt_parse_unbind(struct Buffer *buf, struct Buffer *s,
 
   if (MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     key = buf->data;
   }
   else
@@ -1521,7 +1521,7 @@ enum CommandResult mutt_parse_exec(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     function = buf->data;
 
     bindings = km_get_table(CurrentMenu);

diff --git a/mutt.h b/mutt.h
index 567a0ae3e567e393e564c18cbdd3ddf42e5ad02d..32e27ebc02b3ed172e2f9818c38161364a8d2a95 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -76,7 +76,7 @@ typedef uint16_t TokenFlags;               ///< Flags for mutt_extract_token(),
 #define MUTT_TOKEN_CONDENSE      (1 << 1)  ///< ^(char) to control chars (macros)
 #define MUTT_TOKEN_SPACE         (1 << 2)  ///< Don't treat whitespace as a term
 #define MUTT_TOKEN_QUOTE         (1 << 3)  ///< Don't interpret quotes
-#define MUTT_TOKEN_PATTERN       (1 << 4)  ///< !)|~ are terms (for patterns)
+#define MUTT_TOKEN_PATTERN       (1 << 4)  ///< ~%=!| are terms (for patterns)
 #define MUTT_TOKEN_COMMENT       (1 << 5)  ///< Don't reap comments
 #define MUTT_TOKEN_SEMICOLON     (1 << 6)  ///< Don't treat ; as special
 #define MUTT_TOKEN_BACKTICK_VARS (1 << 7)  ///< Expand variables within backticks

diff --git a/mutt_lua.c b/mutt_lua.c
index d0121a94016535dbf5e4a2e9e5b0a2a7c04d30ce..862500f73e24944116d5c6a8e43e4eda315e4a95 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -475,7 +475,7 @@ enum CommandResult mutt_lua_source_file(struct Buffer *buf, struct Buffer *s,
 
   char path[PATH_MAX];
 
-  if (mutt_extract_token(buf, s, 0) != 0)
+  if (mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS) != 0)
   {
     mutt_buffer_printf(err, _("source: error at %s"), s->dptr);
     return MUTT_CMD_ERROR;

diff --git a/muttlib.c b/muttlib.c
index fd7065d671d7a06827aa42b8f6957f064627d7d9..111e4bb9533248688b0b6e0381157422b8165f80 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -907,7 +907,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c
         mutt_debug(LL_DEBUG3, "fmtpipe +++: %s\n", srcbuf->dptr);
         if (word->data)
           *word->data = '\0';
-        mutt_extract_token(word, srcbuf, 0);
+        mutt_extract_token(word, srcbuf, MUTT_TOKEN_NO_FLAGS);
         mutt_debug(LL_DEBUG3, "fmtpipe %2d: %s\n", i++, word->data);
         mutt_buffer_addch(cmd, '\'');
         mutt_expando_format(tmp, sizeof(tmp), 0, cols, word->data, callback,

diff --git a/score.c b/score.c
index 1dc81a832abd105a333c841147a28c2a02251c51..b92c171372fc09742f0535adaf12ce7160460adc 100644 (file)
--- a/score.c
+++ b/score.c
@@ -101,7 +101,7 @@ enum CommandResult mutt_parse_score(struct Buffer *buf, struct Buffer *s,
   struct Score *ptr = NULL, *last = NULL;
   char *pattern = NULL, *pc = NULL;
 
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "score");
@@ -109,7 +109,7 @@ enum CommandResult mutt_parse_score(struct Buffer *buf, struct Buffer *s,
   }
   pattern = buf->data;
   mutt_buffer_init(buf);
-  mutt_extract_token(buf, s, 0);
+  mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
   if (MoreArgs(s))
   {
     FREE(&pattern);
@@ -206,7 +206,7 @@ enum CommandResult mutt_parse_unscore(struct Buffer *buf, struct Buffer *s,
 
   while (MoreArgs(s))
   {
-    mutt_extract_token(buf, s, 0);
+    mutt_extract_token(buf, s, MUTT_TOKEN_NO_FLAGS);
     if (mutt_str_strcmp("*", buf->data) == 0)
     {
       for (tmp = ScoreList; tmp;)