Revision: 722
Author: ntrel
Date: 2006-08-15 05:51:36 -0700 (Tue, 15 Aug 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=722&view=rev
Log Message:
-----------
Move filename/filetype/encoding debug message to start of document_set_filetype so it is printed before the file is parsed
Modified Paths:
--------------
trunk/src/document.c
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2006-08-15 12:32:56 UTC (rev 721)
+++ trunk/src/document.c 2006-08-15 12:51:36 UTC (rev 722)
@@ -1070,6 +1070,7 @@
if (! type || idx < 0) return;
if (type->id > GEANY_MAX_FILE_TYPES) return;
+ geany_debug("%s : %s (%s)", doc_list[idx].file_name, type->name, doc_list[idx].encoding);
doc_list[idx].file_type = type;
document_update_tag_list(idx, TRUE);
type->style_func_ptr(doc_list[idx].sci);
@@ -1114,7 +1115,6 @@
}
sci_colourise(doc_list[idx].sci, 0, -1);
utils_build_show_hide(idx);
- geany_debug("%s : %s (%s)", doc_list[idx].file_name, type->name, doc_list[idx].encoding);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 721
Author: eht16
Date: 2006-08-15 05:32:56 -0700 (Tue, 15 Aug 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=721&view=rev
Log Message:
-----------
Search the first three lines when replacing the filename in a template(for PHP).
Modified Paths:
--------------
trunk/src/utils.c
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2006-08-15 12:32:27 UTC (rev 720)
+++ trunk/src/utils.c 2006-08-15 12:32:56 UTC (rev 721)
@@ -1930,9 +1930,9 @@
filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc_list[idx].file_type)->extension, NULL);
filename = g_path_get_basename(doc_list[idx].file_name);
- // only search the first 2 lines
+ // only search the first 3 lines
ttf.chrg.cpMin = 0;
- ttf.chrg.cpMax = sci_get_position_from_line(doc_list[idx].sci, 2);
+ ttf.chrg.cpMax = sci_get_position_from_line(doc_list[idx].sci, 3);
ttf.lpstrText = (gchar*)filebase;
if (sci_find_text(doc_list[idx].sci, SCFIND_MATCHCASE, &ttf) != -1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 720
Author: ntrel
Date: 2006-08-15 05:32:27 -0700 (Tue, 15 Aug 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=720&view=rev
Log Message:
-----------
Backported calltips workspace support for C-like user files from Anjuta
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-08-15 12:26:15 UTC (rev 719)
+++ trunk/ChangeLog 2006-08-15 12:32:27 UTC (rev 720)
@@ -1,3 +1,9 @@
+2006-08-15 Nick Treleaven <nick.treleaven(a)btinternet.com>
+
+ * tagmanager/c.c: Backported calltips workspace support for C-like
+ user files from Anjuta.
+
+
2006-08-15 Enrico Tröger <enrico.troeger(a)uvena.de>
* src/callbacks.c:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 719
Author: ntrel
Date: 2006-08-15 05:26:15 -0700 (Tue, 15 Aug 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=719&view=rev
Log Message:
-----------
Use guint for search_get_file_list length
Modified Paths:
--------------
trunk/src/search.c
trunk/tagmanager/c.c
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2006-08-15 11:44:23 UTC (rev 718)
+++ trunk/src/search.c 2006-08-15 12:26:15 UTC (rev 719)
@@ -62,7 +62,7 @@
static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir);
-static GSList *search_get_file_list(const gchar *path, gint *length);
+static GSList *search_get_file_list(const gchar *path, guint *length);
static void add_find_checkboxes(GtkDialog *dialog);
@@ -859,11 +859,11 @@
/* Gets a list of files in the current directory, or NULL if no files found.
* The list and the data in the list should be freed after use.
* *length is set to the number of non-NULL data items in the list. */
-static GSList *search_get_file_list(const gchar *path, gint *length)
+static GSList *search_get_file_list(const gchar *path, guint *length)
{
GError *error = NULL;
GSList *list = NULL;
- gint len = 0;
+ guint len = 0;
const gchar *filename;
GDir *dir;
g_return_val_if_fail(path != NULL, NULL);
Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c 2006-08-15 11:44:23 UTC (rev 718)
+++ trunk/tagmanager/c.c 2006-08-15 12:26:15 UTC (rev 719)
@@ -875,6 +875,14 @@
{
tag->extensionFields.access = accessField (st);
}
+ if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) &&
+ ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) {
+
+ if (1) {
+ tag->extensionFields.arglist = getArglistFromPos(
+ tag->filePosition, tag->name);
+ }
+ }
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.