Escape config vars when expanding hook "command" argument.

The "command" parameter of folder, send, send2, account, reply, and
message hooks is run through mutt_extract_token() twice.  Once when
parsing the hook command initially, and once via mutt_parse_rc_line()
when the actual hook fires.

In theory, Mutt users should be aware of this, and should place all
their command strings with configuration variables in single-quotes,
to delay expansion until execution.

But in reality Mutt has been escaping configuration variables as part
of mutt_extract_token() for many years.

The previous commit turned the escaping off, because it damages
"backup" assignments to a $my_ variable, and I believe is confusing
behavior.

But for hooks, users now expect the escaping behavior (for
double-quoted or unquoted command strings).

Note that mutt_parse_hook() also passed the MUTT_TOKEN_SPACE flag, but
neglected to do so for message-hook.  Since all other "command"
argument hooks were included, and were added to the list over the
years, I believe this was an accidental oversight.

1 files changed, 1 insertions, 0 deletions

diff --git a/mutt.h b/mutt.h
index 482f32fc..82db294c 100644
--- a/mutt.h
+++ b/mutt.h
@@ -126,6 +126,7 @@ struct timespec
 #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_ESC_VARS   (1<<7)  /* escape configuration variables */
 
 typedef struct
 {