Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 21 Apr 2015 13:12:44 UTC Commit: 1d9bb56c4a01f758244e86b81a8b0715ae0be4c1 https://github.com/geany/geany/commit/1d9bb56c4a01f758244e86b81a8b0715ae0be4...

Log Message: ----------- Fix incorrect safety check in non-regex search code

Only warn if MULTILINE is passed *together* with REGEX, but simply ignore if it not.

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

Modified: src/search.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2045,7 +2045,7 @@ static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, gboolean

static gint geany_find_flags_to_sci_flags(GeanyFindFlags flags) { - g_warn_if_fail(! (flags & GEANY_FIND_MULTILINE)); + g_warn_if_fail(! (flags & GEANY_FIND_REGEXP) || ! (flags & GEANY_FIND_MULTILINE));

return ((flags & GEANY_FIND_MATCHCASE) ? SCFIND_MATCHCASE : 0) | ((flags & GEANY_FIND_WHOLEWORD) ? SCFIND_WHOLEWORD : 0) |

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).