diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-02-27 16:11:30 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-02-27 16:11:30 +1100 |
| commit | fd0f2ad6df90dd7c8bf2cbdd781a6b4b3ed88f9b (patch) | |
| tree | 12cbe2901d5ca3e0ec92fbd352616faaed865d50 | |
| parent | 4434a57717efbec42d67c571890fc848183e500f (diff) | |
| download | scintilla-mirror-fd0f2ad6df90dd7c8bf2cbdd781a6b4b3ed88f9b.tar.gz | |
Backport: Use virtual to ensure LexState overrides LineEndTypesSupported method.
Backport of changeset 6462:934f6f6451c2.
| -rw-r--r-- | src/Document.h | 2 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Document.h b/src/Document.h index f69c2a34e..6f803fecf 100644 --- a/src/Document.h +++ b/src/Document.h @@ -181,7 +181,7 @@ public: virtual ~LexInterface() { } void Colourise(Sci::Position start, Sci::Position end); - int LineEndTypesSupported(); + virtual int LineEndTypesSupported(); bool UseContainerLexing() const { return instance == 0; } diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 35e601116..5c0b90dad 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -569,7 +569,7 @@ public: int PropGetInt(const char *key, int defaultValue=0) const; int PropGetExpanded(const char *key, char *result) const; - int LineEndTypesSupported(); + int LineEndTypesSupported() override; int AllocateSubStyles(int styleBase, int numberStyles); int SubStylesStart(int styleBase); int SubStylesLength(int styleBase); |