156 Commits

Author SHA1 Message Date
Colomban Wendling
0b010e2f45 Bash: Fix handling of quoted HereDoc delimiters
Imported from upstream Scintilla bb784e214430498e91c9935bbc841c798629212f

Closes [bugs:#952]
2013-07-23 17:25:53 +02:00
Colomban Wendling
f0f3a6cd99 Update Scintilla to version 3.3.4 2013-07-21 12:04:14 +02:00
Colomban Wendling
8498957cf1 Update Scintilla to version 3.3.3 2013-06-06 16:31:47 +02:00
Colomban Wendling
467639c7c9 Fix inclusion of some build files to the generated tarballs 2013-06-05 20:34:10 +02:00
Colomban Wendling
0dc9e4ec38 Import fix from upstream Scintilla to fix crash upon DnD with GTK3
This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef
from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x."
2013-05-25 17:48:49 +02:00
Colomban Wendling
6cff31488e Import fix from upstream Scintilla to fix crash on drag and drop
This imports Scintilla commit 06f36a3217229ec2c2a360e370ae1b07597ce7b6
from HG, "Fix crashes with SelectionText instances that did not have \0
terminators."
2013-05-25 17:45:07 +02:00
Colomban Wendling
f5588043b7 Update Scintilla to version 3.3.2 2013-05-22 03:23:57 +02:00
Colomban Wendling
e88c03d266 Update Scintilla to version 3.3.1 2013-04-27 18:29:44 +02:00
Colomban Wendling
2dd389a14a Fix our Scintilla patch
It got corrupted for some reason I don't get, but it's now fixed.
2013-04-27 15:32:17 +02:00
Colomban Wendling
71093fec62 Autotools: replace use of deprecated INCLUDES in favor to AM_CPPFLAGS 2013-03-15 16:48:33 +01:00
Baptiste Pierrat
d4e61bf093 Add support for Abaqus files
Support for Abaqus (.inp) files, including scintilla lexer and tag
parser.

Signed-off-by: Baptiste Pierrat <baptiste.pierrat@gmail.com>
2013-02-12 14:56:38 +01:00
Colomban Wendling
d2a8a11587 Merge branch 'printing-with-scintilla' 2013-01-01 18:54:08 +01:00
Colomban Wendling
1bad1551d7 Scintilla: properly update the Pango contexts for the target surface
This fixes drawing on a surface that has different settings (like
scaling) than the display surface, by performing the measurements on a
layout properly set up for the target surface.

In practice, this fixes e.g. printing on a scaled surface.

(Applied to Scintilla HG as 74c71632dd1afa726b0f1608d13413e0864da9b0)
2013-01-01 18:51:52 +01:00
Colomban Wendling
2874357a97 Add new PO lexer to the build system 2012-10-25 17:09:55 +02:00
Colomban Wendling
7acc68ea00 Refresh our Scintilla patch for the new lexers 2012-10-25 17:09:55 +02:00
Colomban Wendling
4d16754267 Update Scintilla to version 3.2.3
Closes #2909124, #3094431 and #3233160.
2012-10-25 17:09:34 +02:00
Colomban Wendling
654f07219f Update Scintilla to version 3.2.2 2012-09-05 00:37:41 +02:00
Colomban Wendling
03509ee1a8 Update Scintilla to version 3.2.1
Closes #3540469
2012-07-14 15:30:03 +02:00
Nick Treleaven
74959b9cb9 Support MSYS=1 to enable building with MSYS; use $/ instead of DIRSEP
Defining MSYS=1 is cleaner than requiring users to define CP, RM, etc.
2012-07-04 17:13:14 +01:00
Nick Treleaven
65fe863691 Use PREFIX=C:/libs and minor cleanup (Windows makefiles)
This PREFIX works on both cmd.exe and MSYS, whereas backslash confuses
MSYS.
Use copy /y in doc/makefile.win32.
Remove unused targets binclean, exec.
2012-07-04 16:47:38 +01:00
Colomban Wendling
4dd0fe9175 Update Scintilla to version 3.2.0 2012-06-26 20:48:16 +02:00
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