diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index c1a77ed67..23aa597a3 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -608,6 +608,14 @@

  • Add mode to draw tabs as [HT] blobs with SCI_SETTABDRAWMODE(SCTD_CONTROLCHAR).
  • +
  • + Improve mouse drag behaviour when drag and drop disabled. + Feature #1581. +
  • +
  • + Fix regression in SCI_CONVERTEOLS that may not convert whole file. + Bug #2501. +
  • Release 5.6.0 diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx index aca496e8c..7f164f5a0 100644 --- a/scintilla/src/Editor.cxx +++ b/scintilla/src/Editor.cxx @@ -4919,7 +4919,7 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, KeyMod modi // Switch to just the click position SetSelection(newPos, newPos); } - if (!sel.Range(selectionPart).Empty()) { + if (dragDropEnabled && !sel.Range(selectionPart).Empty()) { inDragDrop = DragDrop::initial; } } diff --git a/src/Version.h b/src/Version.h index 9102cddc7..b336ec79b 100644 --- a/src/Version.h +++ b/src/Version.h @@ -166,7 +166,9 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build) #if defined(_MSC_VER) #if (_MSC_VER == 1950) - #if (_MSC_FULL_VER >= 195035726) + #if (_MSC_FULL_VER >= 195035727) + #define VER_CPL MS Visual C++ 2026 v18.4.1 + #elif (_MSC_FULL_VER >= 195035726) #define VER_CPL MS Visual C++ 2026 v18.4.0 #elif (_MSC_FULL_VER >= 195035725) #define VER_CPL MS Visual C++ 2026 v18.3.2