Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sun, 17 Jan 2016 03:03:24 UTC
Commit: 1c4a9d8dd3b1c991052088aee3b7641fb54197dd
https://github.com/geany/geany/commit/1c4a9d8dd3b1c991052088aee3b7641fb5419…
Log Message:
-----------
C++: Fix parsing of global scope qualifiers in base class lists
See also https://sourceforge.net/p/ctags/bugs/194/
I didn't use the exact upstream patch only altering the C++ code path,
because as far as I know no c.c language recognize two consecutive
colons separated by whitespace as a single token, so there's no point
in carrying on mistakes from the past.
Modified Paths:
--------------
tagmanager/ctags/c.c
tests/ctags/bug1799343-1.cpp.tags
tests/ctags/bug1799343-2.cpp.tags
Modified: tagmanager/ctags/c.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2639,7 +2639,7 @@ static boolean inheritingDeclaration (declType decl)
static void processColon (statementInfo *const st)
{
- int c = skipToNonWhite ();
+ int c = cppGetc ();
const boolean doubleColon = (boolean) (c == ':');
if (doubleColon)
Modified: tests/ctags/bug1799343-1.cpp.tags
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -1,6 +1,7 @@
# format=tagmanager
C�2048�0
-D�16�()�0
+D�16�()�D�0
+D�2048�0
main�16�(void)�0�int
x�64�C�0�int
-~D�16�()�0
+~D�16�()�D�0
Modified: tests/ctags/bug1799343-2.cpp.tags
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -5,10 +5,11 @@ C
P�1�0
P�1�A�0
Q�1�A�0
+R�1�A::C�0
S�1�B�0
-f�16�(int v)�A::C::<anonymous>�0�int
+f�16�(int v)�A::C::R�0�int
t�64�B::S�0�int
x�64�A::P�0�int
x�64�P�0�int
y�64�A::Q�0�int
-z�64�A::C::<anonymous>�0�int
+z�64�A::C::R�0�int
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Tue, 12 Jan 2016 06:15:54 UTC
Commit: 740ecb00fb4313096b36939101ed9f3e4a54212e
https://github.com/geany/geany/commit/740ecb00fb4313096b36939101ed9f3e4a542…
Log Message:
-----------
doxygen: fix doxygen warnings about filetypes_array references.
Modified Paths:
--------------
src/filetypes.h
Modified: src/filetypes.h
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -40,8 +40,8 @@ struct GeanyDocument;
/** IDs of known filetypes
*
- * @ref filetypes_array will contain an item for each. Use filetypes_array->len to
- * determine the number of known filetypes at runtime */
+ * @ref filetypes will contain an item for each. Use GeanyData::filetypes_array to
+ * determine the known filetypes at runtime */
typedef enum
{
GEANY_FILETYPES_NONE = 0, /* first filetype is always None & must be 0 */
@@ -133,7 +133,7 @@ GeanyFiletypeGroupID;
/** Represents a filetype. */
typedef struct GeanyFiletype
{
- GeanyFiletypeID id; /**< Index in @c filetypes_array. */
+ GeanyFiletypeID id; /**< Index in @ref filetypes. */
/** Represents the langType of tagmanager (see the table
* in tagmanager/parsers.h), -1 represents all, -2 none. */
langType lang;
@@ -163,7 +163,7 @@ typedef struct GeanyFiletype
}
GeanyFiletype;
-/** Wraps @ref filetypes_array so it can be used with C array syntax.
+/** Wraps @ref GeanyData::filetypes_array so it can be used with C array syntax.
* Example: filetypes[GEANY_FILETYPES_C]->name = ...;
* @see filetypes_index(). */
#define filetypes ((GeanyFiletype **)GEANY(filetypes_array)->pdata)
--------------
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: Sat, 09 Jan 2016 18:59:09 UTC
Commit: 8099fddd9262be2888986a40e842b78f13dac050
https://github.com/geany/geany/commit/8099fddd9262be2888986a40e842b78f13dac…
Log Message:
-----------
Remove leftover references to SVN
Closes #856.
Modified Paths:
--------------
README.I18N
configure.ac
m4/geany-revision.m4
Modified: README.I18N
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4,7 +4,7 @@ Quick Guide for new translations
If you would like to translate Geany into another language, have a look at the
language statistics page at [1] first to see if your desired language already
exists. If it already exists, please read the "Notes for updating translations"
-section. Otherwise, get the SVN version of Geany, change to the po directory and
+section. Otherwise, get the Git version of Geany, change to the po directory and
start the new translation with:
$ msginit -l ll_CC -o ll.po -i geany.pot
Modified: configure.ac
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -55,8 +55,8 @@ AC_CHECK_FUNCS([ftruncate fgetpos fnmatch mkstemp strerror strstr])
# autoscan end
-# check for SVN revision
-GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
+# check for VCS revision
+GEANY_CHECK_REVISION([dnl force debug mode for a VCS working copy
CFLAGS="-g -DGEANY_DEBUG $CFLAGS"])
Modified: m4/geany-revision.m4
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
dnl GEANY_CHECK_REVISION([action-if-found], [action-if-not-found])
-dnl Check for the Git-SVN or SVN revision and set REVISION to
-dnl "r<revnum>" or to "-1" if the revision can't be found
+dnl Check for the Git revision and set REVISION to "<revid>"
+dnl or to "-1" if the revision can't be found
dnl Also AC_DEFINEs REVISION
AC_DEFUN([GEANY_CHECK_REVISION],
[
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).