Update Scintilla to version 3.21.1 (#2506)

geany · Sep 26, 2020 · 8f09096 · 8f09096
1 parent c5def01
commit 8f09096
Show file tree

Hide file tree

Showing 120 changed files with 4,919 additions and 3,011 deletions.
diff --git a/scintilla/Makefile.am b/scintilla/Makefile.am
@@ -60,6 +60,7 @@ gtk/scintilla-marshal.c \
 gtk/scintilla-marshal.h \
 lexlib/Accessor.cxx \
 lexlib/Accessor.h \
+lexlib/CatalogueModules.h \
 lexlib/CharacterCategory.cxx \
 lexlib/CharacterCategory.h \
 lexlib/CharacterSet.cxx \

diff --git a/scintilla/gtk/Converter.h b/scintilla/gtk/Converter.h
@@ -29,6 +29,11 @@ class Converter {
 		iconvh = iconvhBad;
 		Open(charSetDestination, charSetSource, transliterations);
 	}
+	// Deleted so Converter objects can not be copied.
+	Converter(const Converter &) = delete;
+	Converter(Converter &&) = delete;
+	Converter &operator=(const Converter &) = delete;
+	Converter &operator=(Converter &&) = delete;
 	~Converter() {
 		Close();
 	}

diff --git a/scintilla/gtk/PlatGTK.cxx b/scintilla/gtk/PlatGTK.cxx