HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let GRegex handle escape sequences itself

Browse Source
This commit is contained in:
Nick Treleaven 2011-12-25 17:22:06 +00:00
parent 21f0715381
commit 773d7e42d2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/search.c
View File

@ -1236,9 +1236,9 @@ on_find_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
gtk_widget_grab_focus(find_dlg.entry); gtk_widget_grab_focus(find_dlg.entry);
return; 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; goto fail;
} }
ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(user_data), search_data.original_text, 0); ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(user_data), search_data.original_text, 0);
@ -1361,13 +1361,8 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
original_find = g_strdup(find); original_find = g_strdup(find);
original_replace = g_strdup(replace); original_replace = g_strdup(replace);
if (search_flags_re & SCFIND_REGEXP)
{ if (search_replace_escape_re && ~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 (! utils_str_replace_escape(find, FALSE) || if (! utils_str_replace_escape(find, FALSE) ||
! utils_str_replace_escape(replace, FALSE)) ! utils_str_replace_escape(replace, FALSE))