HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Annotate geany-specific diffs

Browse Source 
This makes it clearer to see which diffs are related to Geany. Only for
files which are synced, not e.g. for lcpp where changes are everywhere.
This commit is contained in:
Jiří Techet 2016-10-15 16:55:52 +02:00
parent e1b4d14097
commit 38403d1ca0
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctags/main/entry.c
View File

@ -951,8 +951,10 @@ static void recordTagEntryInQueue (const tagEntryInfo *const tag, tagEntryInfo*
slot->extensionFields.typeRef[0] = eStrdup (slot->extensionFields.typeRef[0]);
if (slot->extensionFields.typeRef[1])
slot->extensionFields.typeRef[1] = eStrdup (slot->extensionFields.typeRef[1]);
/* GEANY DIFF */
if (slot->extensionFields.varType)
slot->extensionFields.varType = eStrdup (slot->extensionFields.varType);
/* GEANY DIFF END */
#ifdef HAVE_LIBXML
if (slot->extensionFields.xpath)
slot->extensionFields.xpath = eStrdup (slot->extensionFields.xpath);
@ -1007,8 +1009,10 @@ static void clearTagEntryInQueue (tagEntryInfo* slot)
eFree ((char *)slot->extensionFields.typeRef[0]);
if (slot->extensionFields.typeRef[1])
eFree ((char *)slot->extensionFields.typeRef[1]);
/* GEANY DIFF */
if (slot->extensionFields.varType)
eFree ((char *)slot->extensionFields.varType);
/* GEANY DIFF END */
#ifdef HAVE_LIBXML
if (slot->extensionFields.xpath)
eFree ((char *)slot->extensionFields.xpath);

2
ctags/main/entry.h
View File

@ -79,7 +79,9 @@ struct sTagEntryInfo {
/* type (union/struct/etc.) and name for a variable or typedef. */
const char* typeRef [2]; /* e.g., "struct" and struct name */
/* GEANY DIFF */
const char *varType;
/* GEANY DIFF END */
#define ROLE_INDEX_DEFINITION -1
int roleIndex; /* for role of reference tag */

4
ctags/main/options.c
View File

@ -187,10 +187,12 @@ optionValues Option = {
static OptionLoadingStage Stage = OptionLoadingStageNone;
#define STAGE_ANY ~0UL
/* GEANY DIFF */
/* tags_ignore is a NULL-terminated array of strings, read from ~/.config/geany/ignore.tags.
* This file contains a space or newline separated list of symbols which should be ignored
* by the C/C++ parser, see -I command line option of ctags for details. */
char **c_tags_ignore = NULL;
/* GEANY DIFF END */
/*
- Locally used only
@ -2135,6 +2137,7 @@ static void processHeaderListOption (const int option, const char *parameter)
/* Determines whether or not "name" should be ignored, per the ignore list.
*/
/* GEANY DIFF */
/*
extern const ignoredTokenInfo * isIgnoreToken(const char * name)
{
@ -2206,6 +2209,7 @@ extern bool isIgnoreToken (const char *const name,
}
return result;
}
/* GEANY DIFF END */
static void freeIgnoredTokenInfo(ignoredTokenInfo * info)
{

2
ctags/main/options.h
View File

@ -157,8 +157,10 @@ extern void cArgForth (cookedArgs* const current);
extern bool isExcludedFile (const char* const name);
extern bool isIncludeFile (const char *const fileName);
/* GEANY DIFF */
/* extern const ignoredTokenInfo * isIgnoreToken (const char *const name); */
extern bool isIgnoreToken (const char *const name, bool *const pIgnoreParens, const char **const replacement);
/* GEANY DIFF END */
extern void parseCmdlineOptions (cookedArgs* const cargs);
extern void previewFirstOption (cookedArgs* const cargs);
extern void readOptionConfiguration (void);