• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28668 (tree)
Time2019-10-08 15:12:28
Authorcsware

Log Message

Make CTRL+Return to change EOL work again.

This commit fixes a regression introduced in rev. 28667.

Change Summary

Incremental Difference

--- trunk/src/TortoiseMerge/BaseView.cpp (revision 28667)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 28668)
@@ -3841,9 +3841,6 @@
38413841 bool bControl = !!(GetKeyState(VK_CONTROL)&0x8000);
38423842 bool bSkipSelectionClear = false;
38433843
3844- if (bControl)
3845- return;
3846-
38473844 if (IsReadonly())
38483845 return;
38493846
@@ -3977,7 +3974,7 @@
39773974 m_pViewData->SetState(nViewLine, DIFFSTATE_EDITED);
39783975 UpdateGoalPos();
39793976 }
3980- else if (nChar == VK_RETURN)
3977+ else if ((nChar == VK_RETURN) && !bControl)
39813978 {
39823979 // insert a new, fresh and empty line below the cursor
39833980 RemoveSelectedText();
Show on old repository browser