projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
buffer.c
diff --git
a/buffer.c
b/buffer.c
index
e8c638f
..
8ca84c3
100644
(file)
--- a/
buffer.c
+++ b/
buffer.c
@@
-115,7
+115,7
@@
int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
(ch == '#' && !(flags & M_TOKEN_COMMENT)) ||
(ch == '=' && (flags & M_TOKEN_EQUAL)) ||
(ch == ';' && !(flags & M_TOKEN_SEMICOLON)) ||
(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;
}
break;
}
@@
-257,8
+257,12
@@
int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
var = str_substrdup (tok->dptr, pc);
tok->dptr = pc;
}
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
mem_free (&var);
}
else