From 447c0cdfc614e56ca258da89930168b917a598fb Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Tue, 29 Jul 2014 00:18:03 +0200
Subject: [PATCH] Fix calls to OnCaretMove()

Based on TortoiseSVN revision #25710.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseMerge/BaseView.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp
index 32b764158..e5a9dab31 100644
--- a/src/TortoiseMerge/BaseView.cpp
+++ b/src/TortoiseMerge/BaseView.cpp
@@ -3021,7 +3021,7 @@ void CBaseView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 				{
 					ptCaretPos.x = pos;
 					SetCaretAndGoalPosition(ptCaretPos);
-					OnCaretMove(bShift);
+					OnCaretMove(MOVELEFT, bShift);
 				}
 			}
 		}
@@ -3049,7 +3049,7 @@ void CBaseView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 					ptCaretPos.x--;
 				}
 				SetCaretAndGoalPosition(ptCaretPos);
-				OnCaretMove(bShift);
+				OnCaretMove(MOVERIGHT, bShift);
 			}
 		}
 		break;
-- 
2.11.4.GIT