135 Commits

Author SHA1 Message Date
Nick Treleaven
23009bf35d Fix using CXX, CC as usual to prevent override problems (Windows build) 2012-06-04 13:51:04 +01:00
Nick Treleaven
c37d8b4390 Do not suppress warnings (Windows makefiles)
Also do not define G_OS_WIN32.
2012-06-04 13:51:02 +01:00
Nick Treleaven
8818ee3fc9 Include gdk-pixbuf-2.0 path for recent GTK+ dev (Windows build)
Fixes #3396195.

Note: GTK+ 2.24 is the current maintained version of the developer
files bundle:
http://www.gtk.org/download/win32.php
2011-12-08 12:53:11 +00:00
Colomban Wendling
eb064df5b6 TCL: Highlight words as keywords after '{' as this highlights 'else'
Upstream Scintilla applied it as 3924:e2385dff420a.

Closes #3432877.
2011-12-05 19:51:08 +01:00
Colomban Wendling
cbc5600a1a Update to Scintilla 2.29 2011-10-19 03:40:46 +02:00
Nick Treleaven
d9b7ae92b8 Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
Include makefile.win32 in EXTRA_DIST recursively, not at top-level.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6013 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-10-06 12:36:28 +00:00
Colomban Wendling
d6278f3381 Make hightlighting of triple-quoted verbatim an option
Backport from Scintilla HG (3602:5536ed81a85b).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5696 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-08 00:13:24 +00:00
Enrico Tröger
8e6ed9905c Reset cursors when Scintilla widget is realized (Backport from Scintilla HG, original patch by Matthew Brush).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5693 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 18:06:09 +00:00
Enrico Tröger
938477a073 Fix X PRIMARY selection issue when Scintilla widget is unrealized/re-realized (Backport from Scintilla HG, original patch by Matthew Brush).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5692 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 18:03:35 +00:00
Colomban Wendling
b7e0ebfea1 Fix font rendering in the Scintilla when using Cairo
Always get the Pango context through GTK+ API rather than creating it
from a Cairo context to always get a context set up for the screen.

This fixes font size issues when using Cairo rendering.

Patch imported from upstream Mercurial (3596/070c7eb483bf).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5690 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 17:58:07 +00:00
Enrico Tröger
a43d27d0a4 Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5685 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-03 16:38:31 +00:00
Enrico Tröger
abdb3c4c20 Add Scintilla's version.txt file.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5683 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-03 16:21:50 +00:00
Enrico Tröger
c0b726a298 Update Scintilla to version 2.25.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5682 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-03 16:16:52 +00:00
Enrico Tröger
ec408fa4b9 Add filetype Cobol (based on a patch by Seth Keiper).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5533 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-01-30 15:03:51 +00:00
Nick Treleaven
43dc30a5d1 Merge trunk to r5519.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5520 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-01-10 13:58:12 +00:00
Nick Treleaven
ab6bde023a Add README for Scintilla explaining keeping in sync with scintilla.org and using Scintilla.iface instead of manual header editing.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5499 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-12-24 13:52:08 +00:00
Nick Treleaven
2982f22337 Backport Scintilla HG fix: Remove styling idle in destructor to
avoid crashing when idle called after ScintillaGTK instance
destroyed (fixes #3111058).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5462 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-12-03 13:51:54 +00:00
Nick Treleaven
f201500ed5 Backport Scintilla HG fix: Remove styling idle in destructor to
avoid crashing when idle called after ScintillaGTK instance
destroyed (fixes #3111058).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5460 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-12-03 13:28:13 +00:00
Enrico Tröger
313e0e0413 Update for Scintilla 2.22.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5445 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-28 15:37:13 +00:00
Enrico Tröger
b106aca3e5 Update Windows-Makefile-based build system for Scintilla.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5442 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-24 23:14:59 +00:00
Enrico Tröger
5fb38517e3 Update autotools-based build system for Scintilla.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5441 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-24 21:43:31 +00:00
Enrico Tröger
2c7d37dde4 Update Scintilla to version 2.22.
Keep Scintilla's directory structure mostly and only remove unused lexers.

For now, this will break the build. The build systems have to be updated as well as scintilla_changes.patch.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5437 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-24 21:23:05 +00:00
Nick Treleaven
38e23095dd Add Erlang filetype (patch by Taylor Venable, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5308 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-10-20 15:45:25 +00:00
Nick Treleaven
b109889e5e Add Lisp filetype (patch by Mário Silva, thanks).
Note: Lisp lexer was taken from Scintilla instead.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5286 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-10-06 17:10:15 +00:00
Nick Treleaven
054afed310 Add Forth filetype (patch by Thomas Huth, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5266 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-09-30 16:59:22 +00:00
Nick Treleaven
3d21fde5df Backport list box memory leak fixes from Scintilla 2.20.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5201 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-08-25 17:00:38 +00:00
Nick Treleaven
f847f1add6 Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5188 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-08-23 12:14:58 +00:00
Nick Treleaven
74b5ed053a Link Octave instead of Matlab.
Add comment about not being autogenerated.
Minor changes to fit Scintilla order.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5183 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-08-20 11:28:40 +00:00
Nick Treleaven
472c06fc8b Fix infinite loop in Markdown lexer (patch by Colomban Wendling,
thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5168 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-08-16 12:32:18 +00:00
Nick Treleaven
9f3677d3e2 Add C++ lexer property fold.cpp.comment.explicit (patch sent); set
it disabled.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5076 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-07-01 11:49:30 +00:00
Enrico Tröger
2cebcd7383 Remove unused Crontab lexer.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5006 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-06-06 18:36:23 +00:00
Enrico Tröger
16a0313b35 Update Scintilla to version 2.12.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5005 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-06-06 18:34:26 +00:00
Enrico Tröger
10ad339994 Update Scintilla to version 2.11.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4923 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-05-16 17:44:24 +00:00
Nick Treleaven
c14fc12dd0 Backport fix from Scintilla CVS to fix using SCI_GETSELECTIONSTART
and SCI_GETSELECTIONEND with rectangular selections. This fixes
replacing in a rectangular selection.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4806 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-04-07 16:58:33 +00:00
Enrico Tröger
7db7ef002d Backport fix from Scintilla CVS to not paste text beyond the end of lines (closes #2969096).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4781 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-03-20 15:40:45 +00:00
Nick Treleaven
dacfa1c66b Backport minor formatting/style changes from Scintilla project.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4747 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-03-09 17:07:53 +00:00
Enrico Tröger
7396f7672d Update Scintilla to version 2.03.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4723 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-03-07 10:31:51 +00:00
Enrico Tröger
f7c739923c Backport R lexer from Scintilla CVS to fix case sensitive keywords (Scintilla bug #2956543).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4708 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-02-28 12:56:19 +00:00
Nick Treleaven
5f28284cb1 Apply patch from Kelvin Gardiner to add Verilog filetype (thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4474 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-12-07 17:51:37 +00:00
Nick Treleaven
d3350e0bbc Revert temporary change for scintilla to say if tab was used for autocompletion.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4329 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-16 16:25:17 +00:00
Nick Treleaven
d5404fa57f Undo merge of Scintilla.h, Scintilla.iface from upstream - could be confusing.
Keep new SCI_AUTOCGETCURRENTTEXT message though.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4328 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-16 16:19:51 +00:00
Nick Treleaven
fc00f011c8 Improve word part autocompletion so AC list is not cancelled and
reshown (this also stops the selection changing).
Add SCI_AUTOCGETCURRENTTEXT message (will be sent upstream).
Merge Scintilla.h, Scintilla.iface from upstream.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4327 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-16 12:13:01 +00:00
Nick Treleaven
6befde884b Add word part autocompletion for the current selected item when
pressing Tab - Enter still completes normally.
Add foreach_str() API macro.
Temporarily modify scintilla to say if tab was used for
autocompletion.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4320 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-10-15 14:57:11 +00:00
Nick Treleaven
5e55af41fc Add Markdown filetype (patch by Jon Strait, thanks).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4046 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-30 11:29:53 +00:00
Enrico Tröger
aba1691372 Update Scintilla to version 1.79.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3911 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-07-04 09:19:36 +00:00
Nick Treleaven
d0b4f550d1 Backport fix from Scintilla CVS:
Pascal lexer hanging on file that starts with 'interface' after
whitespace.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3859 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-06-11 14:25:20 +00:00
Enrico Tröger
ac50ceb983 Backport change from Scintilla CVS:
Change capitalisation of header file to suit cross-compilation on Unix for Windows.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3774 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-08 17:04:40 +00:00
Enrico Tröger
e2f7bdd3b6 Update Scintilla to version 1.78.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3769 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-05-03 17:49:33 +00:00
Enrico Tröger
00bc23cec4 Backport recent changes from Scintilla CVS to add partial support for RFC2822 styled text using the Properties lexer.
Ignore leading whitespace for config files and RFC2822 text.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3669 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-03-30 17:49:40 +00:00
Enrico Tröger
3db0b856a7 Backport a change from Scintilla CVS to fix wrong folding of comments in HTML/XML lexer (Scintilla #2532774, thanks to Jason Oster).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3583 ea778897-0a13-0410-b9d1-a72fbfd435f5
2009-02-15 10:55:58 +00:00