From 14eb5b009416465e7ce21523e7f67b78ce9411a8 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Fri, 28 Jul 2017 19:46:13 +0200 Subject: [PATCH] Fix template parsing broken by commit 814b087. --- src/compose.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/compose.c b/src/compose.c index a2b189103..023b36d8e 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3131,9 +3131,6 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo, buf = quote_fmt_get_buffer(); - quote_fmt_reset_vartable(); - quote_fmtlex_destroy(); - if (buf == NULL) alertpanel_error(_("The \"Quotation mark\" of the template is invalid.")); else @@ -3171,13 +3168,9 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo, if (buf == NULL) { gint line = quote_fmt_get_line(); alertpanel_error(err_msg, line); - quote_fmt_reset_vartable(); - quote_fmtlex_destroy(); goto error; } - quote_fmt_reset_vartable(); - quote_fmtlex_destroy(); } else buf = ""; @@ -8846,6 +8839,8 @@ static void compose_template_apply(Compose *compose, Template *tmpl, compose_template_apply_fields(compose, tmpl); compose_attach_from_list(compose, quote_fmt_get_attachments_list(), FALSE); quote_fmt_reset_vartable(); + quote_fmtlex_destroy(); + compose_changed_cb(NULL, compose); #ifdef USE_ENCHANT -- 2.25.1