[geany/geany] 773d7e: Let GRegex handle escape sequences itself

Nick Treleaven git-noreply at xxxxx
Thu Jul 26 00:02:26 UTC 2012


Branch:      refs/heads/document-messages
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Sun, 25 Dec 2011 17:22:06
Commit:      773d7e42d24ca83d5458ec78ac30f10b29884bca
             https://github.com/geany/geany/commit/773d7e42d24ca83d5458ec78ac30f10b29884bca

Log Message:
-----------
Let GRegex handle escape sequences itself


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

Modified: src/search.c
13 files changed, 4 insertions(+), 9 deletions(-)
===================================================================
@@ -1236,9 +1236,9 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags)
 			gtk_widget_grab_focus(find_dlg.entry);
 			return;
 		}
-		if (settings.find_escape_sequences || search_data.flags & SCFIND_REGEXP)
+		if (settings.find_escape_sequences && ~search_data.flags & SCFIND_REGEXP)
 		{
-			if (! utils_str_replace_escape(search_data.text, search_data.flags & SCFIND_REGEXP))
+			if (! utils_str_replace_escape(search_data.text, FALSE))
 				goto fail;
 		}
 		ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(user_data), search_data.original_text, 0);
@@ -1361,13 +1361,8 @@ static void replace_in_session(GeanyDocument *doc,
 
 	original_find = g_strdup(find);
 	original_replace = g_strdup(replace);
-	if (search_flags_re & SCFIND_REGEXP)
-	{
-		if (! utils_str_replace_escape(find, TRUE) ||
-			! utils_str_replace_escape(replace, TRUE))
-			goto fail;
-	}
-	else if (search_replace_escape_re)
+
+	if (search_replace_escape_re && ~search_flags_re & SCFIND_REGEXP)
 	{
 		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).



More information about the Commits mailing list