(ch == '#' && !(flags & M_TOKEN_COMMENT)) ||
(ch == '=' && (flags & M_TOKEN_EQUAL)) ||
(ch == ';' && !(flags & M_TOKEN_SEMICOLON)) ||
- ((flags & M_TOKEN_PATTERN) && strchr ("~!|", ch)))
+ ((flags & M_TOKEN_PATTERN) && strchr ("~=!|", ch)))
break;
}
var = str_substrdup (tok->dptr, pc);
tok->dptr = pc;
}
- if (var && (env = getenv (var)))
- mutt_buffer_addstr (dest, env);
+ if (var) {
+ char tmp[STRING];
+ if ((env = getenv (var)) ||
+ (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
+ mutt_buffer_addstr (dest, env);
+ }
mem_free (&var);
}
else