From ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Sun, 5 Jan 2020 17:10:23 -0500
Subject: Synchronizing LongTerm3 with default. Ideally this covers anything
 missed during the backport process.

---
 src/ScintillaBase.cxx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/ScintillaBase.cxx')

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) {
-- 
cgit v1.2.3