Revision: 2676
http://geany.svn.sourceforge.net/geany/?rev=2676&view=rev
Author: eht16
Date: 2008-06-10 09:18:08 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Fix endless loop when there are two triple strings on one line inside a multiline string.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/python.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-10 13:51:45 UTC (rev 2675)
+++ trunk/ChangeLog 2008-06-10 16:18:08 UTC (rev 2676)
@@ -3,6 +3,9 @@
* src/utils.c:
Allow and use arguments to the browser command (closes #1989575).
Add 'xdg-open' as first browser fallback.
+ * tagmanager/python.c:
+ Fix endless loop when there are two triple strings on one line
+ inside a multiline string.
2008-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/tagmanager/python.c
===================================================================
--- trunk/tagmanager/python.c 2008-06-10 13:51:45 UTC (rev 2675)
+++ trunk/tagmanager/python.c 2008-06-10 16:18:08 UTC (rev 2676)
@@ -423,7 +423,7 @@
while (1)
{
/* Check if the sting ends in the same line. */
- s = strstr (string, *which);
+ s = strstr (s, *which);
if (!s) break;
s += 3;
*which = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2674
http://geany.svn.sourceforge.net/geany/?rev=2674&view=rev
Author: ntrel
Date: 2008-06-10 05:16:27 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Remove unnecessary vStringClear(name) calls after using the name
buffer, as the convention is now to clear the buffer before use, and
this is easier to remember to do.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/python.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-09 19:29:54 UTC (rev 2673)
+++ trunk/ChangeLog 2008-06-10 12:16:27 UTC (rev 2674)
@@ -1,3 +1,11 @@
+2008-06-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/python.c:
+ Remove unnecessary vStringClear(name) calls after using the name
+ buffer, as the convention is now to clear the buffer before use, and
+ this is easier to remember to do.
+
+
2008-06-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* scintilla/makefile.win32:
@@ -15,8 +23,8 @@
above (it's statically linked into GLib).
Install Geany's message catalogs into share/locale rather than
lib/locale as GTK does since 2.12.2.
-
+
2008-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/python.c:
Modified: trunk/tagmanager/python.c
===================================================================
--- trunk/tagmanager/python.c 2008-06-09 19:29:54 UTC (rev 2673)
+++ trunk/tagmanager/python.c 2008-06-10 12:16:27 UTC (rev 2674)
@@ -571,7 +571,6 @@
parseFunction(cp, name, parent, is_parent_class);
addNestingLevel(nesting_levels, indent, name, is_class);
- vStringClear(name);
}
}
/* Find global and class variables */
@@ -595,8 +594,6 @@
continue;
makeVariableTag (name, parent);
-
- vStringClear (name);
}
}
/* Clean up all memory we allocated. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2672
http://geany.svn.sourceforge.net/geany/?rev=2672&view=rev
Author: eht16
Date: 2008-06-09 10:43:48 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
Remove useless path separator.
Set $(docdir) if it is not set automatically.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.in
trunk/doc/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/ChangeLog 2008-06-09 17:43:48 UTC (rev 2672)
@@ -3,6 +3,10 @@
* scintilla/makefile.win32:
Compile Scintilla without threading support to fix freezes with
GLib >= 2.16 on Windows.
+ * doc/Makefile.am:
+ Remove useless path separator.
+ * configure.in:
+ Set $(docdir) if it is not set automatically.
2008-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/configure.in 2008-06-09 17:43:48 UTC (rev 2672)
@@ -230,6 +230,12 @@
fi
fi
+# Set ${docdir} if it is empty
+if test -z "${docdir}"; then
+ docdir='${datadir}/doc/${PACKAGE}'
+ AC_SUBST(docdir)
+fi
+
GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps`
AC_SUBST(GEANY_PIXMAPS_DIR)
GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-06-09 17:29:25 UTC (rev 2671)
+++ trunk/doc/Makefile.am 2008-06-09 17:43:48 UTC (rev 2672)
@@ -1,5 +1,5 @@
man_MANS=geany.1
-DOCDIR = $(DESTDIR)/$(docdir)
+DOCDIR = $(DESTDIR)$(docdir)
IMAGE_FILES = images/*.png
EXTRA_DIST = geany.html geany.css geany.txt geany.1 plugins.dox plugin-symbols.c \
$(srcdir)/$(IMAGE_FILES)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2670
http://geany.svn.sourceforge.net/geany/?rev=2670&view=rev
Author: eht16
Date: 2008-06-09 10:17:38 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
Remove useless check (left-over from testing).
Modified Paths:
--------------
trunk/tagmanager/python.c
Modified: trunk/tagmanager/python.c
===================================================================
--- trunk/tagmanager/python.c 2008-06-09 17:12:19 UTC (rev 2669)
+++ trunk/tagmanager/python.c 2008-06-09 17:17:38 UTC (rev 2670)
@@ -454,8 +454,6 @@
break; /* allow 'x = func(b=2,y=2,' lines */
eq++;
}
- if (*eq == '=')
- return NULL; /* can this happen? */
/* go backwards to the start of the line, checking we have valid chars */
start = cp - 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.