Default to the config.h default if markup is not set
If neither the new 'markup' option is set nor 'allow_markup' then default to whatever mode is set in config.h.
This commit is contained in:
parent
faea58159c
commit
eb2fda4bde
@ -104,7 +104,7 @@ void load_settings(char *cmdline_config_path)
|
|||||||
|
|
||||||
{
|
{
|
||||||
//If markup isn't set, fall back to allow_markup for backwards compatibility
|
//If markup isn't set, fall back to allow_markup for backwards compatibility
|
||||||
if(ini_is_set("global", "markup") || cmdline_is_set("-markup")) {
|
if (ini_is_set("global", "markup") || cmdline_is_set("-markup")) {
|
||||||
char *c = option_get_string(
|
char *c = option_get_string(
|
||||||
"global",
|
"global",
|
||||||
"markup", "-markup", markup,
|
"markup", "-markup", markup,
|
||||||
@ -122,6 +122,8 @@ void load_settings(char *cmdline_config_path)
|
|||||||
|
|
||||||
settings.markup = (allow_markup ? MARKUP_FULL : MARKUP_STRIP);
|
settings.markup = (allow_markup ? MARKUP_FULL : MARKUP_STRIP);
|
||||||
fprintf(stderr, "Warning: 'allow_markup' is deprecated, please use 'markup' instead.\n");
|
fprintf(stderr, "Warning: 'allow_markup' is deprecated, please use 'markup' instead.\n");
|
||||||
|
} else {
|
||||||
|
settings.markup = parse_markup_mode(markup); // None are set, parse the default value from config.h
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user