[geany/geany] 387d07: Fix escaping replacement text for regex matching (oops)

[Nick Treleaven]

Branch:      refs/heads/document-messages
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Mon, 26 Dec 2011 13:01:54
Commit:      387d071b608157fd4abd0f0e5f2a7dd81a5d1164
             https://github.com/geany/geany/commit/387d071b608157fd4abd0f0e5f2a7dd81a5d1164

Log Message:
-----------
Fix escaping replacement text for regex matching (oops)


Modified Paths:
--------------
    src/search.c

Modified: src/search.c
8 files changed, 7 insertions(+), 1 deletions(-)
===================================================================
@@ -1362,7 +1362,13 @@ static void replace_in_session(GeanyDocument *doc,
 	original_find = g_strdup(find);
 	original_replace = g_strdup(replace);
 
-	if (search_replace_escape_re && ~search_flags_re & SCFIND_REGEXP)
+	if (search_flags_re & SCFIND_REGEXP)
+	{
+		/* find escapes will be handled by GRegex */
+		if (! utils_str_replace_escape(replace, TRUE))
+			goto fail;
+	}
+	else if (search_replace_escape_re)
 	{
 		if (! utils_str_replace_escape(find, FALSE) ||
 			! utils_str_replace_escape(replace, FALSE))


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).