diff options
| author | mitchell <unknown> | 2020-01-05 17:10:23 -0500 |
|---|---|---|
| committer | mitchell <unknown> | 2020-01-05 17:10:23 -0500 |
| commit | ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 (patch) | |
| tree | a2469638126f8a958ad6e86b6ee6b2b7eedaf036 /src/ScintillaBase.cxx | |
| parent | 51c270affe753fcfae24887ee940e8061c631d7d (diff) | |
| download | scintilla-mirror-ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601.tar.gz | |
Synchronizing LongTerm3 with default.
Ideally this covers anything missed during the backport process.
Diffstat (limited to 'src/ScintillaBase.cxx')
| -rw-r--r-- | src/ScintillaBase.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
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) { |