README.md

@@ -78,9 +78,9 @@ For some platforms, you will need to refer to [the installation guide](https://w
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
 OpenMSX for music can be found at:
 
-- [OpenGFX](https://www.openttd.org/downloads/opengfx-releases/latest)
+- https://www.openttd.org/downloads/opengfx-releases/latest for OpenGFX
-- [OpenSFX](https://www.openttd.org/downloads/opensfx-releases/latest)
+- https://www.openttd.org/downloads/opensfx-releases/latest for OpenSFX
-- [OpenMSX](https://www.openttd.org/downloads/openmsx-releases/latest)
+- https://www.openttd.org/downloads/openmsx-releases/latest for OpenMSX
 
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.

src/textbuf.cpp

@@ -247,21 +247,14 @@ void Textbuf::DeleteText(uint16_t from, uint16_t to, bool update)
 	this->bytes -= to - from;
 	this->chars -= c;
 
-	auto fixup = [&](uint16_t &pos) {
-		if (pos <= from) return;
-		if (pos <= to) {
-			pos = from;
-		} else {
-			pos -= to - from;
-		}
-	};
-
 	/* Fixup caret if needed. */
-	fixup(this->caretpos);
+	if (this->caretpos > from) {
-
+		if (this->caretpos <= to) {
-	/* Fixup marked text if needed. */
+			this->caretpos = from;
-	fixup(this->markpos);
+		} else {
-	fixup(this->markend);
+			this->caretpos -= to - from;
+		}
+	}
 
 	if (update) {
 		this->UpdateStringIter();