From aaca08fc972fb37f15e0b4e21de2b67c094021ed Mon Sep 17 00:00:00 2001 From: Nils Schweinsberg Date: Thu, 2 Jul 2009 00:36:37 -0600 Subject: [PATCH] Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils). --- ChangeLog | 3 +++ src/conky.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 15c554a..ec13029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-07-01 + * Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils) + 2009-06-29 * Fix segfault in to_real_path, it's sometimes called with the same source and dest without checking the length, causing a segfault. diff --git a/src/conky.c b/src/conky.c index 6f7bde3..ef64b57 100644 --- a/src/conky.c +++ b/src/conky.c @@ -3385,6 +3385,8 @@ static int extract_variable_text_internal(struct text_object *retval, const char append_object(retval, obj); } } + } else if (*p == '\\' && *(p+1) == '#') { + strfold(p, 1); } else if (*p == '#') { remove_comment(p); } -- 1.7.9.5