Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Thu, 28 Jul 2016 21:55:56 UTC
Commit: 7b9d0dd83ce0874593758a620a9b9a2d256503c1
https://github.com/geany/geany/commit/7b9d0dd83ce0874593758a620a9b9a2d25650…
Log Message:
-----------
Make parser includes closer to uctags and sync parser license header
Adds (currently empty) debug.h, routines.h and xtag.h and uses them at the
same places like uctags.
Modified Paths:
--------------
ctags/Makefile.am
ctags/main/debug.h
ctags/main/routines.h
ctags/main/xtag.h
ctags/parsers/asm.c
ctags/parsers/basic.c
ctags/parsers/c.c
ctags/parsers/cobol.c
ctags/parsers/css.c
ctags/parsers/diff.c
ctags/parsers/erlang.c
ctags/parsers/fortran.c
ctags/parsers/go.c
ctags/parsers/html.c
ctags/parsers/jscript.c
ctags/parsers/json.c
ctags/parsers/lua.c
ctags/parsers/make.c
ctags/parsers/objc.c
ctags/parsers/pascal.c
ctags/parsers/perl.c
ctags/parsers/php.c
ctags/parsers/python.c
ctags/parsers/r.c
ctags/parsers/ruby.c
ctags/parsers/rust.c
ctags/parsers/sh.c
ctags/parsers/sql.c
ctags/parsers/tcl.c
ctags/parsers/verilog.c
ctags/parsers/vhdl.c
Modified: ctags/Makefile.am
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -57,6 +57,7 @@ libctags_la_SOURCES = \
main/args.h \
main/ctags.c \
main/ctags.h \
+ main/debug.h \
main/entry.c \
main/entry.h \
main/general.h \
@@ -77,10 +78,12 @@ libctags_la_SOURCES = \
main/parsers.h \
main/read.c \
main/read.h \
+ main/routines.h \
main/sort.c \
main/sort.h \
main/strlist.c \
main/strlist.h \
main/vstring.c \
main/vstring.h \
+ main/xtag.h \
$(parsers)
Modified: ctags/main/debug.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/routines.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/main/xtag.h
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: ctags/parsers/asm.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for assembly language
* files.
@@ -15,9 +15,11 @@
#include <string.h>
+#include "debug.h"
#include "keyword.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "main.h"
#include "vstring.h"
Modified: ctags/parsers/basic.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2006, Darren Hiebert, Elias Pschernig
*
* This source code is released for free distribution under the terms of the
- * GNU General Public License.
+ * GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for BlitzBasic
* (BlitzMax), PureBasic and FreeBasic language files. For now, this is kept
@@ -19,6 +19,7 @@
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/c.c
10 lines changed, 6 insertions(+), 4 deletions(-)
===================================================================
@@ -1,11 +1,10 @@
/*
-*
-* Copyright (c) 1996-2001, Darren Hiebert
+* Copyright (c) 1996-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
-* This module contains functions for parsing and scanning C, C++, D and Java
+* This module contains functions for parsing and scanning C, C++, C#, D and Java
* source files.
*/
@@ -17,6 +16,7 @@
#include <string.h>
#include <setjmp.h>
+#include "debug.h"
#include "mio.h"
#include "entry.h"
#include "get.h"
@@ -25,6 +25,8 @@
#include "options.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
+#include "xtag.h"
/*
* MACROS
Modified: ctags/parsers/cobol.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for COBOL language
* files.
@@ -13,6 +13,7 @@
*/
#include "general.h" /* must always come first */
#include "parse.h"
+#include "routines.h"
/*
* FUNCTION DEFINITIONS
Modified: ctags/parsers/css.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,6 +2,7 @@
* css.c
* Token-based parser for CSS definitions
* Author - Colomban Wendling <colomban(a)geany.org>
+ * License GPL-2
**************************************************************************/
#include "general.h"
@@ -11,7 +12,7 @@
#include "entry.h"
#include "parse.h"
#include "read.h"
-
+#include "routines.h"
typedef enum eCssKinds {
K_CLASS, K_SELECTOR, K_ID
Modified: ctags/parsers/diff.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@
* Copyright (c) 2000-2001, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for diff files (based on Sh parser).
*/
@@ -17,6 +17,7 @@
#include <string.h>
#include "parse.h"
+#include "routines.h"
#include "read.h"
#include "vstring.h"
Modified: ctags/parsers/erlang.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2003, Brent Fulgham <bfulgham(a)debian.org>
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Erlang language
* files. Some of the parsing constructs are based on the Emacs 'etags'
@@ -18,7 +18,7 @@
#include "entry.h"
#include "options.h"
#include "read.h"
-// #include "routines.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/fortran.c
9 lines changed, 6 insertions(+), 3 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 1998-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Fortran language
* files.
@@ -11,21 +11,24 @@
/*
* INCLUDE FILES
*/
-#include "general.h" /* must always come first */
+#include "general.h" /* must always come first */
#include <string.h>
#include <limits.h>
-#include <ctype.h> /* to define tolower () */
+#include <ctype.h> /* to define tolower () */
#include <setjmp.h>
+#include "debug.h"
#include "mio.h"
#include "entry.h"
#include "keyword.h"
#include "main.h"
#include "options.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
+#include "xtag.h"
/*
* MACROS
Modified: ctags/parsers/go.c
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -1,14 +1,20 @@
/*
+* This source code is released for free distribution under the terms of the
+* GNU General Public License version 2 or (at your option) any later version.
+*
* INCLUDE FILES
*/
#include "general.h" /* must always come first */
+#include "debug.h"
#include "entry.h"
#include "keyword.h"
#include "read.h"
#include "main.h"
+#include "routines.h"
#include "vstring.h"
#include "options.h"
+#include "xtag.h"
/*
* MACROS
Modified: ctags/parsers/html.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for HTML language
* files.
@@ -13,6 +13,7 @@
*/
#include "general.h" /* must always come first */
#include "parse.h"
+#include "routines.h"
/*
* FUNCTION DEFINITIONS
Modified: ctags/parsers/jscript.c
6 lines changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -2,11 +2,13 @@
* Copyright (c) 2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
- * GNU General Public License.
+ * GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for JavaScript language
* files.
*
+ * Reference: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+ *
* This is a good reference for different forms of the function statement:
* http://www.permadi.com/tutorial/jsFunc/
* Another good reference:
@@ -23,11 +25,13 @@
#include <stdio.h>
#endif
+#include "debug.h"
#include "mio.h"
#include "keyword.h"
#include "parse.h"
#include "read.h"
#include "main.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/json.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2014, Colomban Wendling <colomban(a)geany.org>
*
* This source code is released for free distribution under the terms of the
- * GNU General Public License.
+ * GNU General Public License version 2 or (at your option) any later version.
*/
/*
* This module contains functions for generating tags for JSON files.
@@ -17,11 +17,13 @@
#include "general.h"
#include <string.h>
+#include "debug.h"
#include "main.h"
#include "entry.h"
#include "keyword.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
typedef enum {
Modified: ctags/parsers/lua.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2001, Max Ischenko <mfi(a)ukr.net>.
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Lua language.
*/
@@ -16,6 +16,7 @@
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/make.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2005, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for makefiles.
*/
@@ -19,7 +19,9 @@
#include "options.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
+#include "xtag.h"
/*
* DATA DEFINITIONS
Modified: ctags/parsers/objc.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@
* Copyright (c) 2010, Vincent Berthoux
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Objective C
* language files.
@@ -19,6 +19,7 @@
#include "entry.h"
#include "options.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/* To get rid of unused parameter warning in
Modified: ctags/parsers/pascal.c
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2001-2002, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for the Pascal language,
* including some extensions for Object Pascal.
@@ -11,14 +11,15 @@
/*
* INCLUDE FILES
*/
-#include "general.h" /* must always come first */
+#include "general.h" /* must always come first */
#include <string.h>
#include "entry.h"
#include "parse.h"
#include "read.h"
#include "main.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/perl.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for PERL language
* files.
@@ -12,14 +12,17 @@
* INCLUDE FILES
*/
#include "general.h" /* must always come first */
+#include "debug.h"
#include <string.h>
#include "entry.h"
#include "options.h"
#include "read.h"
#include "main.h"
+#include "routines.h"
#include "vstring.h"
+#include "xtag.h"
#define TRACE_PERL_C 0
#define TRACE if (TRACE_PERL_C) printf("perl.c:%d: ", __LINE__), printf
Modified: ctags/parsers/php.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2013, Colomban Wendling <ban(a)herbesfolles.org>
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains code for generating tags for the PHP scripting
* language.
@@ -18,6 +18,8 @@
#include "vstring.h"
#include "keyword.h"
#include "entry.h"
+#include "routines.h"
+#include "debug.h"
#define SCOPE_SEPARATOR "::"
Modified: ctags/parsers/python.c
7 lines changed, 5 insertions(+), 2 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Python language
* files.
@@ -15,11 +15,14 @@
#include <string.h>
#include "entry.h"
+#include "nestlevel.h"
#include "options.h"
#include "read.h"
#include "main.h"
#include "vstring.h"
-#include "nestlevel.h"
+#include "routines.h"
+#include "debug.h"
+#include "xtag.h"
/*
* DATA DEFINITIONS
Modified: ctags/parsers/r.c
7 lines changed, 4 insertions(+), 3 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2003-2004, Ascher Stefan <stievie(a)utanet.at>
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for R language files.
* R is a programming language for statistical computing.
@@ -12,11 +12,12 @@
/*
* INCLUDE FILES
*/
-#include "general.h" /* must always come first */
+#include "general.h" /* must always come first */
#include <string.h>
-#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */
+#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */
+#include "debug.h"
#include "entry.h"
#include "read.h"
#include "vstring.h"
Modified: ctags/parsers/ruby.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -17,10 +17,12 @@
#include <string.h>
+#include "debug.h"
#include "entry.h"
#include "parse.h"
#include "nestlevel.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/rust.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
/*
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for Rust files.
*/
@@ -19,6 +19,7 @@
#include "entry.h"
#include "options.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/sh.c
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2002, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for scripts for the
* Bourne shell (and its derivatives, the Korn and Z shells).
@@ -11,14 +11,16 @@
/*
* INCLUDE FILES
*/
-#include "general.h" /* must always come first */
+#include "general.h" /* must always come first */
#include <string.h>
#include "parse.h"
#include "read.h"
#include "main.h"
+#include "routines.h"
#include "vstring.h"
+#include "xtag.h"
/*
* DATA DEFINITIONS
Modified: ctags/parsers/sql.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,10 +1,8 @@
/*
- * $Id$
- *
* Copyright (c) 2002-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
- * GNU General Public License.
+ * GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for PL/SQL language
* files.
@@ -21,11 +19,13 @@
#include <stdio.h>
#endif
+#include "debug.h"
#include "entry.h"
#include "keyword.h"
#include "parse.h"
#include "main.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/tcl.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
* Copyright (c) 2000-2003, Darren Hiebert
*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
+* GNU General Public License version 2 or (at your option) any later version.
*
* This module contains functions for generating tags for TCL scripts.
*/
@@ -16,6 +16,7 @@
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
Modified: ctags/parsers/verilog.c
11 lines changed, 7 insertions(+), 4 deletions(-)
===================================================================
@@ -1,12 +1,12 @@
/*
* Copyright (c) 2003, Darren Hiebert
-*
+*
* This source code is released for free distribution under the terms of the
-* GNU General Public License.
-*
+* GNU General Public License version 2 or (at your option) any later version.
+*
* This module contains functions for generating tags for the Verilog HDL
* (Hardware Description Language).
-*
+*
* Language definition documents:
* http://www.eg.bucknell.edu/~cs320/verilog/verilog-manual.html
* http://www.sutherland-hdl.com/on-line_ref_guide/vlog_ref_top.html
@@ -22,11 +22,14 @@
#include <string.h>
#include <setjmp.h>
+#include "debug.h"
#include "keyword.h"
#include "parse.h"
#include "read.h"
#include "vstring.h"
#include "get.h"
+#include "routines.h"
+#include "xtag.h"
/*
* DATA DECLARATIONS
Modified: ctags/parsers/vhdl.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -19,9 +19,11 @@
#include <string.h>
#include <setjmp.h>
+#include "debug.h"
#include "keyword.h"
#include "parse.h"
#include "read.h"
+#include "routines.h"
#include "vstring.h"
/*
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Thu, 28 Jul 2016 18:57:03 UTC
Commit: ffa09b0ae2d2486b80ac32da49584dacacb77e08
https://github.com/geany/geany/commit/ffa09b0ae2d2486b80ac32da49584dacacb77…
Log Message:
-----------
ctags: Remove unused Geany-specific tagEntryInfo fields
Original patch from Colomban Wendling, only converted to apply to the new
ctags location in the source tree.
Modified Paths:
--------------
ctags/main/entry.h
Modified: ctags/main/entry.h
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -55,7 +55,6 @@ typedef struct sTagEntryInfo {
boolean lineNumberEntry;/* pattern or line number entry */
unsigned long lineNumber; /* line number of tag */
MIOPos filePosition; /* file position of line containing tag */
- int bufferPosition; /* buffer position of line containing tag */
const char* language; /* language of source file */
boolean isFileScope; /* is tag visible only within source file? */
boolean isFileEntry; /* is this just an entry for a file name? */
@@ -74,7 +73,6 @@ typedef struct sTagEntryInfo {
const char *varType;
} extensionFields; /* list of extension fields*/
int type;
- unsigned long seekPosition;
} tagEntryInfo;
/*
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Simon Marchi <simon.marchi(a)polymtl.ca>
Committer: Matthew Brush <matt(a)geany.org>
Date: Sat, 10 Sep 2016 03:52:01 UTC
Commit: 13ef73d109ad6fba3189b2f69c3c88b3f30e9772
https://github.com/geany/geany/commit/13ef73d109ad6fba3189b2f69c3c88b3f30e9…
Log Message:
-----------
Recognize .exp (Expect) files as Tcl
Expect [1] scripts filenames generally end in .exp, although the code
itself is actually in Tcl. I find my self manually selecting Tcl quite
often, so I think it would be nice if Geany would recognize it direcly
as Tcl.
[1] http://expect.sourceforge.net/
Signed-off-by: Simon Marchi <simon.marchi(a)polymtl.ca>
Modified Paths:
--------------
data/filetype_extensions.conf
Modified: data/filetype_extensions.conf
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -61,7 +61,7 @@ Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile;
Scala=*.scala;*.scl;
Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;.bashrc;bash.bashrc;.bash_*;bash_*;*.m4;PKGBUILD;*profile;
SQL=*.sql;
-Tcl=*.tcl;*.tk;*.wish;
+Tcl=*.tcl;*.tk;*.wish;*.exp;
Txt2tags=*.t2t;
Vala=*.vala;*.vapi;
Verilog=*.v;
--------------
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: Wed, 07 Sep 2016 09:09:52 UTC
Commit: a5a888c5e3c4be965907e1fa6671e3510815658d
https://github.com/geany/geany/commit/a5a888c5e3c4be965907e1fa6671e35108156…
Log Message:
-----------
Merge pull request #1217 from b4n/filetypes/c-lexer-properties
Inherit C lexer_properties in all filetypes inheriting C styles
Modified Paths:
--------------
data/filedefs/filetypes.CUDA.conf
data/filedefs/filetypes.Genie.conf
data/filedefs/filetypes.Graphviz.conf
data/filedefs/filetypes.JSON.conf
data/filedefs/filetypes.Scala.conf
data/filedefs/filetypes.actionscript
data/filedefs/filetypes.cpp
data/filedefs/filetypes.cs
data/filedefs/filetypes.ferite
data/filedefs/filetypes.glsl
data/filedefs/filetypes.go
data/filedefs/filetypes.haxe
data/filedefs/filetypes.java
data/filedefs/filetypes.javascript
data/filedefs/filetypes.vala
Modified: data/filedefs/filetypes.CUDA.conf
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -11,9 +11,7 @@ secondary=__device__ __global__ __shared__ __host__ __constant__ gridDim blockId
# these are the Doxygen keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
-[lexer_properties]
-styling.within.preprocessor=1
-lexer.cpp.track.preprocessor=0
+[lexer_properties=C]
[settings]
lexer_filetype=C
Modified: data/filedefs/filetypes.Genie.conf
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -8,7 +8,7 @@ primary=abstract and array as assert async bool break byte case cast char class
# these are the Doxygen and Valadoc keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
-[lexer_properties]
+[lexer_properties=C]
lexer.cpp.triplequoted.strings=1
[settings]
Modified: data/filedefs/filetypes.Graphviz.conf
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -8,9 +8,9 @@ secondary=Damping K URL area arrowhead arrowsize arrowtail aspect bb bgcolor col
# these are the Doxygen keywords
docComment=
-[lexer_properties]
+
+[lexer_properties=C]
styling.within.preprocessor=0
-lexer.cpp.track.preprocessor=0
[settings]
lexer_filetype=C
Modified: data/filedefs/filetypes.JSON.conf
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -1,5 +1,7 @@
[styling=C]
+[lexer_properties=C]
+
[keywords]
primary=true false null
Modified: data/filedefs/filetypes.Scala.conf
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List O
# these are some doxygen keywords (incomplete)
docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
-[lexer_properties]
+[lexer_properties=C]
lexer.cpp.triplequoted.strings=1
[settings]
Modified: data/filedefs/filetypes.actionscript
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -7,6 +7,8 @@ primary=arguments break case catch class const continue default do dynamic each
secondary=decodeURI decodeURIcomponent encodeURI encodeURIcomponent escape isFinite isNaN isXMLName parseFloat parseInt trace unescape
classes=ArgumentError Array Boolean Class Date DefinitionError Error EvalError Function int Math NameSpace Null Number Object QName RangeError ReferenceError RegExp SecurityError String SyntaxError TypeError uint URIError Vector VerifyError void XML XMLList
+[lexer_properties=C]
+
[settings]
# default extension used when saving files
extension=as
Modified: data/filedefs/filetypes.cpp
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -8,9 +8,7 @@ secondary=
# these are the Doxygen keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
-[lexer_properties]
-styling.within.preprocessor=1
-lexer.cpp.track.preprocessor=0
+[lexer_properties=C]
[settings]
lexer_filetype=C
Modified: data/filedefs/filetypes.cs
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -8,9 +8,7 @@
# these are some doxygen keywords (incomplete)
docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
-[lexer_properties]
-styling.within.preprocessor=1
-lexer.cpp.track.preprocessor=0
+[lexer_properties=C]
[settings]
lexer_filetype=C
Modified: data/filedefs/filetypes.ferite
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -7,6 +7,8 @@ primary=false null self super true abstract alias and arguments attribute_missin
types=boolean string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array Regexp XSLT
docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning
+[lexer_properties=C]
+
[settings]
# default extension used when saving files
extension=fe
Modified: data/filedefs/filetypes.glsl
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -8,9 +8,7 @@ secondary=
# these are some doxygen keywords (incomplete)
docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return returns see since struct throw todo typedef var version warning union
-[lexer_properties]
-styling.within.preprocessor=1
-lexer.cpp.track.preprocessor=0
+[lexer_properties=C]
[settings]
lexer_filetype=C
Modified: data/filedefs/filetypes.go
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -10,9 +10,8 @@ secondary=bool byte complex64 complex128 error float32 float64 int int8 int16 in
# these are the Doxygen keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
-[lexer_properties]
+[lexer_properties=C]
lexer.cpp.backquoted.strings=1
-styling.within.preprocessor=1
lexer.cpp.allow.dollars=0
fold.preprocessor=0
Modified: data/filedefs/filetypes.haxe
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -7,7 +7,7 @@ primary=abstract break case catch class const continue trace do else enum extend
secondary=Bool Dynamic Float Int null Void Enum String
classes=Array ArrayAccess Class Date DateTools EReg Hash IntHash IntIter Iterable Iterator Lambda List Math Null Protected Reflect Std StringBuf StringTools Type UInt ValueType Xml XmlType
-[lexer_properties]
+[lexer_properties=C]
# Haxe preprocessor has different directive than C, which the C lexer doesn't understand, so
# we explicitly need not track the preprocessor at all.
lexer.cpp.track.preprocessor=0
Modified: data/filedefs/filetypes.java
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -8,6 +8,7 @@
doccomment=author deprecated exception param return see serial serialData serialField since throws todo version
typedefs=
+[lexer_properties=C]
[settings]
# default extension used when saving files
Modified: data/filedefs/filetypes.javascript
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,8 @@
primary=break case catch class const continue default delete do each else extends false finally for function get if in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype
secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt
+[lexer_properties=C]
+
[settings]
# default extension used when saving files
extension=js
Modified: data/filedefs/filetypes.vala
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -8,9 +8,7 @@ primary=abstract as async base bool break callback case catch char class const c
# these are the Doxygen and Valadoc keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
-[lexer_properties]
-styling.within.preprocessor=1
-lexer.cpp.track.preprocessor=0
+[lexer_properties=C]
lexer.cpp.triplequoted.strings=1
[settings]
--------------
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: Wed, 07 Sep 2016 09:05:17 UTC
Commit: db6f671135511bd107d18d512270503047eb19ac
https://github.com/geany/geany/commit/db6f671135511bd107d18d512270503047eb1…
Log Message:
-----------
GTK: Fix autoc font size on GTK >= 3.21.0
GTK 3.21.0 fixed font size handling, leading to properly interpreting
pixels and points in CSS declarations. However, as older versions
incorrectly handled those, the code has to handle both behaviours.
>From CSS, GTK < 3.21.0 actually applied the conversion to points, but
incorrectly: 10px was used as 10pt, but 10pt was scaled up twice.
So, assuming 96 DPI, it leads to:
font-size | 3.20.0 | 3.21.0 |
----------|---------|---------|
10px | 13.33px | 10px |
10pt | 17.77px | 13.33px |
So, we need to fix the code to accommodate for both (either scaling
ourselves, or adapting the unit: I chose the second, simpler, option).
See https://git.gnome.org/browse/gtk+/commit/?id=df08fc91bdc1d2e4c866122304fabe…
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1859/
X-Scintilla-Commit-ID: a4b5da8b3a0a05a1e67ba7eb08474106d421b088
Modified Paths:
--------------
scintilla/gtk/PlatGTK.cxx
Modified: scintilla/gtk/PlatGTK.cxx
10 lines changed, 9 insertions(+), 1 deletions(-)
===================================================================
@@ -1494,7 +1494,15 @@ void ListBoxX::SetFont(Font &scint_font) {
ssFontSetting << "font-family: " << pango_font_description_get_family(pfd) << "; ";
ssFontSetting << "font-size:";
ssFontSetting << static_cast<double>(pango_font_description_get_size(pfd)) / PANGO_SCALE;
- ssFontSetting << "px; ";
+ // On GTK < 3.21.0 the units are incorrectly parsed, so a font size in points
+ // need to use the "px" unit. Normally we only get fonts in points here, so
+ // don't bother to handle the case the font is actually in pixels on < 3.21.0.
+ if (gtk_check_version(3, 21, 0) != NULL || // on < 3.21.0
+ pango_font_description_get_size_is_absolute(pfd)) {
+ ssFontSetting << "px; ";
+ } else {
+ ssFontSetting << "pt; ";
+ }
ssFontSetting << "font-weight:"<< pango_font_description_get_weight(pfd) << "; ";
ssFontSetting << "}";
gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(cssProvider),
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Wed, 07 Sep 2016 07:34:42 UTC
Commit: 3f140861061ad0367f004a06caf391f1b9f94507
https://github.com/geany/geany/commit/3f140861061ad0367f004a06caf391f1b9f94…
Log Message:
-----------
Improve template command error message
The previous string was a bit confusing what the placeholders
could mean. There was an error in the German translation where
the second placeholder was interpreted as template name instead
of the error message.
This change should make it more clear and also put the error message
to the end of the string.
Modified Paths:
--------------
src/templates.c
Modified: src/templates.c
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -615,8 +615,9 @@ static gchar *run_command(const gchar *command, const gchar *file_name,
}
else
{
- g_warning(_("Cannot execute command \"%s\" from the template: %s. "
- "Check the path in the template."), command, error->message);
+ g_warning(_("Cannot execute template command \"%s\". "
+ "Hint: incorrect paths in the command are a common cause of errors. "
+ "Error: %s."), command, error->message);
g_error_free(error);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).