From 8020f3c37bdca30e9fab860fa37d7b696ba3a2d9 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Mon, 3 Jan 2011 11:05:01 +1100
Subject: Right click cancels autocompletion and sets focus. Bug #3144531.

---
 win32/ScintillaWin.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index faf2dfb61..603e9b6f8 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -768,8 +768,11 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
 			break;
 
 		case WM_RBUTTONDOWN:
-			if (!PointInSelection(Point::FromLong(lParam)))
+			::SetFocus(MainHWND());
+			if (!PointInSelection(Point::FromLong(lParam))) {
+				CancelModes();
 				SetEmptySelection(PositionFromLocation(Point::FromLong(lParam)));
+			}
 			break;
 
 		case WM_SETCURSOR:
-- 
cgit v1.2.3