Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils).
authorNils Schweinsberg <n-sch@users.sourceforge.net>
Thu, 2 Jul 2009 06:36:37 +0000 (00:36 -0600)
committerBrenden Matthews <brenden@rty.ca>
Thu, 2 Jul 2009 06:36:37 +0000 (00:36 -0600)
ChangeLog
src/conky.c

index 15c554a..ec13029 100644 (file)
--- 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.
index 6f7bde3..ef64b57 100644 (file)
@@ -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);
                }