From 4dd8870891525172071f3b77ec09bebd7235fef4 Mon Sep 17 00:00:00 2001 From: harrybharry Date: Tue, 22 Apr 2008 23:36:11 +0000 Subject: [PATCH] Add lt and gt chars to isWordChar check. Fix small regression with hilite and purge. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@178 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.h | 2 ++ PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index 2700be294..a61930188 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -727,6 +727,8 @@ private: case '}': case '|': case '=': + case '<': + case '>': case '\\': return false; } diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 09bd53c62..10666bd4f 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -925,7 +925,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const { int nbReplaced = 0; - if (!isCreated()) + if (!isCreated() && !txt2find) return nbReplaced; if ((op == ProcessReplaceAll) && (*_ppEditView)->getCurrentBuffer().isReadOnly()) return nbReplaced; @@ -1020,17 +1020,12 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const if (op == ProcessMarkAll) //if marking, check if purging is needed { - if ((_doStyleFoundToken) && (_doPurge)) + if (_doPurge) { if (_doMarkLine) (*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK); if (_doStyleFoundToken) - { - (*_ppEditView)->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE); - } - if (_doStyleFoundToken) - { - (*_ppEditView)->execute(SCI_SETLEXER, SCLEX_NULL); + (*_ppEditView)->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE); } }