[ENHANCEMENT] (Author: Andreas Jonsson) Enhance the delimiter selection(Ctrl + double click) feature.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1074 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/src/NppNotification.cpp

@@ -488,8 +488,20 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 				{
 					if(bufstring.at(i) == nppGUI._leftmostDelimiter)
 					{
-						leftmost_position = i;
-						break;
+						// Respect escaped quotation marks.
+						if(nppGUI._leftmostDelimiter == '"')
+						{
+							if(! (i > 0 && bufstring.at(i - 1) == '\\'))
+							{
+								leftmost_position = i;
+								break;
+							}
+						}
+						else
+						{
+							leftmost_position = i;
+							break;
+						}
 					}
 				}
 
@@ -501,8 +513,20 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 				{
 					if(bufstring.at(i) == nppGUI._rightmostDelimiter)
 					{
-						rightmost_position = i;
-						break;
+						// Respect escaped quotation marks.
+						if(nppGUI._rightmostDelimiter == '"')
+						{
+							if(! (i > 0 && bufstring.at(i - 1) == '\\'))
+							{
+								rightmost_position = i;
+								break;
+							}
+						}
+						else
+						{
+							rightmost_position = i;
+							break;
+						}
 					}
 				}
 			}

PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp

@@ -904,7 +904,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 						else
 						{
 							TCHAR moreInfo[128];
-							if(nbCounted <= 1)
+							if (nbCounted == 1)
 								wsprintf(moreInfo, TEXT("Count: %d match."), nbCounted);
 							else
 								wsprintf(moreInfo, TEXT("Count: %d matches."), nbCounted);
@@ -2120,7 +2120,7 @@ void FindReplaceDlg::execSavedCommand(int cmd, int intValue, generic_string stri
 					else
 					{
 						TCHAR moreInfo[128];
-						if (nbCounted <= 1)
+						if (nbCounted == 1)
 							wsprintf(moreInfo, TEXT("Count: %d match."), nbCounted);
 						else
 							wsprintf(moreInfo, TEXT("Count: %d matches."), nbCounted);