From eb2fda4bded0626023378ef4dc8ef118022bde82 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Sun, 12 Feb 2017 21:27:55 +0200 Subject: [PATCH] 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. --- src/settings.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/settings.c b/src/settings.c index 323542f..f4876f6 100644 --- a/src/settings.c +++ b/src/settings.c @@ -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(ini_is_set("global", "markup") || cmdline_is_set("-markup")) { + if (ini_is_set("global", "markup") || cmdline_is_set("-markup")) { char *c = option_get_string( "global", "markup", "-markup", markup, @@ -122,6 +122,8 @@ void load_settings(char *cmdline_config_path) settings.markup = (allow_markup ? MARKUP_FULL : MARKUP_STRIP); 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 } }