Synchronizing LongTerm3 with default.

Ideally this covers anything missed during the backport process.

4 files changed, 12 insertions, 3 deletions

diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index 99520f3cb..591d2c623 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -94,4 +94,3 @@ const char *EditModel::GetFoldDisplayText(Sci::Line lineDoc) const {
 	const char *text = pcs->GetFoldDisplayText(lineDoc);
 	return text ? text : defaultFoldDisplayText.get();
 }
-
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 6850d0964..c16f25ac6 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -59,7 +59,7 @@
 
 using namespace Scintilla;
 
-static inline bool IsControlCharacter(int ch) {
+static constexpr bool IsControlCharacter(int ch) noexcept {
 	// iscntrl returns true for lots of chars > 127 which are displayable
 	return ch >= 0 && ch < ' ';
 }
@@ -1563,6 +1563,7 @@ static void DrawMarkUnderline(Surface *surface, const EditModel &model, const Vi
 		marks >>= 1;
 	}
 }
+
 static void DrawTranslucentSelection(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
 	Sci::Line line, PRectangle rcLine, int subLine, Range lineRange, int xStart) {
 	if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) || (vsDraw.selAdditionalAlpha != SC_ALPHA_NOALPHA)) {
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 0b7adbd67..b538fee2e 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -675,7 +675,15 @@ void LexState::SetWordList(int n, const char *wl) {
 }
 
 const char *LexState::GetName() const {
-	return lexCurrent ? lexCurrent->languageName : "";
+	if (lexCurrent) {
+		return lexCurrent->languageName;
+	}
+	if (instance) {
+		if (instance->Version() >= lvIdentity) {
+			return static_cast<ILexerWithIdentity *>(instance)->GetName();
+		}
+	}
+	return "";
 }
 
 void *LexState::PrivateCall(int operation, void *pointer) {
diff --git a/src/Style.h b/src/Style.h
index 1f7f02fe6..956a55b65 100644
--- a/src/Style.h
+++ b/src/Style.h
@@ -72,6 +72,7 @@ public:
 
 	Style();
 	Style(const Style &source);
+	// Style objects should not be moved but MSVC 2015 requires this.
 	Style(Style &&) = default;
 	~Style();
 	Style &operator=(const Style &source);