From: Mikael Magnusson Date: Fri, 8 Jan 2010 20:07:04 +0000 (+0100) Subject: Fix the ~ expansion regex X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=2b0dfb81cfe60d40827f0231aac9a95adca33137;p=chaz%2Fopenbox Fix the ~ expansion regex The look-around things are fixed-width but the [stuff] is 1 char, and the $ is 0 so it didn't work. I already used that trick for the ^, maybe it used to work due to a bug or smth. --- diff --git a/parser/parse.c b/parser/parse.c index ed66f088..897d738f 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -462,7 +462,8 @@ gchar *parse_expand_tilde(const gchar *f) if (!f) return NULL; - regex = g_regex_new("(?:^|(?<=[ \\t]))~(?=[/ \\t$])", G_REGEX_MULTILINE | G_REGEX_RAW, 0, NULL); + regex = g_regex_new("(?:^|(?<=[ \\t]))~(?:(?=[/ \\t])|$)", + G_REGEX_MULTILINE | G_REGEX_RAW, 0, NULL); ret = g_regex_replace_literal(regex, f, -1, 0, g_get_home_dir(), 0, NULL); g_regex_unref(regex);