Branch: refs/heads/master
Author: Alexander <AleXoundOS(a)users.noreply.github.com>
Committer: Alexander <AleXoundOS(a)users.noreply.github.com>
Date: Thu, 05 May 2016 22:15:51 UTC
Commit: 6b608974c0217fab182285c71cb9991fc630629a
https://github.com/geany/geany/commit/6b608974c0217fab182285c71cb9991fc6306…
Log Message:
-----------
Fix Haskell single line comments by adding space
Haskell single line comments consist of at least two dashes "--",
not followed by special symbol.
So in practice everywhere in code you will see a space following "--".
Reference: Haskell 2010 Language Report -> Chapter 2 -> Lexical Structure
Modified Paths:
--------------
data/filedefs/filetypes.haskell
Modified: data/filedefs/filetypes.haskell
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -51,7 +51,7 @@ mime_type=text/x-haskell
#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# single comments, like # in this file
-comment_single=--
+comment_single=--\s
# multiline comments
comment_open={-
comment_close=-}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Yan Pashkovsky <Yanpas(a)users.noreply.github.com>
Committer: Yan Pashkovsky <Yanpas(a)users.noreply.github.com>
Date: Wed, 04 May 2016 13:21:13 UTC
Commit: 175d9873054d21f953f41b940b759c22169c6b5e
https://github.com/geany/geany/commit/175d9873054d21f953f41b940b759c22169c6…
Log Message:
-----------
Reviewed java
Modified Paths:
--------------
data/filedefs/filetypes.java
Modified: data/filedefs/filetypes.java
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
[styling=C]
[keywords]
-primary=abstract assert break case catch class const continue default do else enum extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static strictfp super switch synchronized this throw throws transient try var volatile while true false null
+primary=abstract assert break case catch class const continue default do else enum extends final finally for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while true false null
secondary=boolean byte char double float int long short void
# documentation keywords for javadoc
doccomment=author deprecated exception param return see serial serialData serialField since throws todo version
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 02 May 2016 13:19:26 UTC
Commit: 28a99f8188724a999f74751501c1e223c2d61a7f
https://github.com/geany/geany/commit/28a99f8188724a999f74751501c1e223c2d61…
Log Message:
-----------
GTK: Properly ask wText what size it wants to please GTK 3.20
It's not really of any use as we do know any size would do as wText is
ours anyway, but GTK 3.20 doesn't like allocating without querying the
preferred size beforehand, so do it.
As wText has a size_request() of 100x100, this might change how we
allocate in case we used to underallocate it, but AFAIK we don't, and
it is the real minimum size expected.
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: d06e3db3e26842cd136328df17eb6f864b3adc02
Modified Paths:
--------------
scintilla/gtk/ScintillaGTK.cxx
Modified: scintilla/gtk/ScintillaGTK.cxx
13 lines changed, 11 insertions(+), 2 deletions(-)
===================================================================
@@ -1769,8 +1769,17 @@ void ScintillaGTK::Resize(int width, int height) {
alloc.x = 0;
alloc.y = 0;
- alloc.width = Platform::Maximum(1, width - verticalScrollBarWidth);
- alloc.height = Platform::Maximum(1, height - horizontalScrollBarHeight);
+ alloc.width = 1;
+ alloc.height = 1;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ // please GTK 3.20 and ask wText what size it wants, although we know it doesn't really need
+ // anything special as it's ours.
+ gtk_widget_get_preferred_size(PWidget(wText), &requisition, NULL);
+ alloc.width = requisition.width;
+ alloc.height = requisition.height;
+#endif
+ alloc.width = Platform::Maximum(alloc.width, width - verticalScrollBarWidth);
+ alloc.height = Platform::Maximum(alloc.height, height - horizontalScrollBarHeight);
gtk_widget_size_allocate(GTK_WIDGET(PWidget(wText)), &alloc);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).