blob: 64834cc4677a0d39d73c276f24e2f59601fd1baf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff -r 5693714a8b0b src/Catalogue.cxx
--- a/src/Catalogue.cxx Fri Dec 06 16:19:52 2013 +1100
+++ b/src/Catalogue.cxx Sun Dec 15 21:21:20 2013 -0500
@@ -74,6 +74,7 @@
// Shorten the code that declares a lexer and ensures it is linked in by calling a method.
#define LINK_LEXER(lexer) extern LexerModule lexer; Catalogue::AddLexerModule(&lexer);
+#if 0
//++Autogenerated -- run scripts/LexGen.py to regenerate
//**\(\tLINK_LEXER(\*);\n\)
LINK_LEXER(lmA68k);
@@ -187,6 +188,8 @@
LINK_LEXER(lmYAML);
//--Autogenerated -- end of automatically generated section
+#endif
+ LINK_LEXER(lmLPeg);
return 1;
}
diff -r eb69b2b4bb85 gtk/ScintillaGTK.cxx
--- a/gtk/ScintillaGTK.cxx Mon Jan 18 09:02:53 2016 +1100
+++ b/gtk/ScintillaGTK.cxx Wed Jan 20 00:52:11 2016 -0500
@@ -3110,7 +3110,7 @@
// of the signal handlers here (those that currently attached to wDraw
// in Initialise() may require coordinate translation?)
- object_class->dispose = Dispose;
+ //object_class->dispose = Dispose;
object_class->finalize = Destroy;
#if GTK_CHECK_VERSION(3,0,0)
widget_class->get_preferred_width = GetPreferredWidth;
--- a/src/EditView.cxx 2017-10-06 14:21:52.634733696 +0200
+++ b/src/EditView.cxx 2017-10-06 15:06:12.449296662 +0200
@@ -1328,13 +1328,7 @@
// For each selection draw
for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) {
const bool mainCaret = r == model.sel.Main();
- SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret);
- if (vsDraw.caretStyle == CARETSTYLE_BLOCK && !drawDrag && posCaret > model.sel.Range(r).anchor) {
- if (posCaret.VirtualSpace() > 0)
- posCaret.SetVirtualSpace(posCaret.VirtualSpace() - 1);
- else
- posCaret.SetPosition(model.pdoc->MovePositionOutsideChar(posCaret.Position()-1, -1));
- }
+ const SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret);
const int offset = posCaret.Position() - posLineStart;
const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth;
|
