Sync Scintilla tab indent changes.

Author: zufuliu

scintilla/include/SciLexer.h

@@ -1,6 +1,7 @@
 /* Scintilla source code edit control */
 /** @file SciLexer.h
- ** Interface to the added lexer functions in the SciLexer version of the edit control.
+ ** Interface to the lexer functions in Lexilla.
+ ** File called SciLexer.h ro retain compatibility with client code.
  **/
 /* Copyright 1998-2002 by Neil Hodgson <[email protected]>
  * The License.txt file describes the conditions under which this software may be distributed. */
@@ -9,7 +10,7 @@
  * file which contains any comments about the definitions. HFacerLexer.py does the generation. */
 #pragma once
 
-/* SciLexer features - not in standard Scintilla */
+/* Lexilla features */
 
 /* ++Autogenerated -- start of section automatically generated from SciLexer.iface */
 #define STYLE_LINK 33

scintilla/src/CallTip.cxx

@@ -39,15 +39,9 @@ size_t Chunk::Length() const noexcept {
 
 namespace {
 
-#ifdef __APPLE__
-// Archaic macOS colours for the default: black on light yellow
-constexpr ColourRGBA colourTextAndArrow(black);
-constexpr ColourRGBA colourBackground(0xff, 0xff, 0xc6);
-#else
 // Grey on white
 constexpr ColourRGBA colourTextAndArrow(0x80, 0x80, 0x80);
 constexpr ColourRGBA colourBackground(white);
-#endif
 
 constexpr ColourRGBA silver(0xc0, 0xc0, 0xc0);
 

scintilla/src/Editor.cxx

@@ -4169,6 +4169,12 @@ int Editor::KeyDownWithModifiers(Keys key, KeyMod modifiers, bool *consumed) {
 
 void Editor::Indent(bool forwards, bool lineIndent) {
 	const UndoGroup ug(pdoc);
+	// Avoid problems with recalculating rectangular range multiple times by temporarily
+	// treating rectangular selection as multiple stream selection.
+	const Selection::SelTypes selType = sel.selType;
+	if (sel.IsRectangular()) {
+		sel.selType = Selection::SelTypes::stream;
+	}
 	for (size_t r = 0; r < sel.Count(); r++) {
 		const Sci::Line lineOfAnchor =
 			pdoc->SciLineFromPosition(sel.Range(r).anchor.Position());
@@ -4243,6 +4249,8 @@ void Editor::Indent(bool forwards, bool lineIndent) {
 			}
 		}
 	}
+	sel.selType = selType;	// Restore rectangular mode
+	ThinRectangularRange();
 	ContainerNeedsUpdate(Update::Selection);
 }
 
@@ -8962,7 +8970,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 		return DefWndProc(iMessage, wParam, lParam);
 	}
 
-	// If there was a change that needs its selection saved and it wasn't explicity saved
+	// If there was a change that needs its selection saved and it wasn't explicitly saved
 	// then do that here.
 	RememberCurrentSelectionForRedoOntoStack();
 

version.txt

@@ -5,17 +5,17 @@ git clone https://github.com/XhmikosR/notepad2-mod.git
 Scintilla (upstream)
 hg clone http://hg.code.sf.net/p/scintilla/code scintilla
 5.5.7
-2025-06-12 9771:b24f00cb53d6
+2025-10-29 9785:4200efc4b867
 
 Lexilla (upstream)
 git clone https://github.com/ScintillaOrg/lexilla.git
 5.4.5
-2025-06-12 1666f9bff3c13d428914adb449b97cfce8d58f16
+2025-10-31 c5e7646f40bbd670815206b021aba8955a2e229e
 
 SciTE (upstream)
 hg clone http://hg.code.sf.net/p/scintilla/scite
 5.5.7
-2025-06-12 6492:c188f560d9de
+2025-10-12 6503:fa143cf46f84
 
 Boost regex 7.0.1
 1.88 https://github.com/boostorg/regex