Revision: 2278
http://geany.svn.sourceforge.net/geany/?rev=2278&view=rev
Author: eht16
Date: 2008-02-24 02:22:35 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
Remove /tmp include directory, oops.
Modified Paths:
--------------
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-02-24 10:20:30 UTC (rev 2277)
+++ trunk/src/Makefile.am 2008-02-24 10:22:35 UTC (rev 2278)
@@ -47,7 +47,7 @@
support.h \
plugindata.h
-INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -I/tmp @GTK_CFLAGS@
+INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@
# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla
nodist_EXTRA_geany_SOURCES = dummy.cxx
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2277
http://geany.svn.sourceforge.net/geany/?rev=2277&view=rev
Author: eht16
Date: 2008-02-24 02:20:30 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
Apply patch Yura Siamashka to add a check for the presence of fnmatch(), thanks.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-24 10:18:36 UTC (rev 2276)
+++ trunk/ChangeLog 2008-02-24 10:20:30 UTC (rev 2277)
@@ -2,6 +2,9 @@
* tagmanager/options.c, src/symbols.c, src/symbols.h:
Define c_tags_ignore in options.c (tagmanager) instead of symbols.c.
+ * configure.in:
+ Apply patch Yura Siamashka to add a check for the presence of
+ fnmatch(), thanks.
2008-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-02-24 10:18:36 UTC (rev 2276)
+++ trunk/configure.in 2008-02-24 10:20:30 UTC (rev 2277)
@@ -135,6 +135,9 @@
case "${host}" in
*mingw*)
+ AC_CHECK_LIB(iberty, fnmatch, [], [
+ AC_MSG_ERROR([fnmatch dosn't present in libiberty. You need to update it, read http://geany.uvena.de/Support/CrossCompile for details.])
+ ])
AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
want_vte="no"
want_socket="no"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2276
http://geany.svn.sourceforge.net/geany/?rev=2276&view=rev
Author: eht16
Date: 2008-02-24 02:18:36 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
Define c_tags_ignore in options.c (tagmanager) instead of symbols.c.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/symbols.c
trunk/src/symbols.h
trunk/tagmanager/options.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-22 17:29:45 UTC (rev 2275)
+++ trunk/ChangeLog 2008-02-24 10:18:36 UTC (rev 2276)
@@ -1,3 +1,9 @@
+2008-02-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/options.c, src/symbols.c, src/symbols.h:
+ Define c_tags_ignore in options.c (tagmanager) instead of symbols.c.
+
+
2008-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/options.c:
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2008-02-22 17:29:45 UTC (rev 2275)
+++ trunk/src/symbols.c 2008-02-24 10:18:36 UTC (rev 2276)
@@ -86,10 +86,8 @@
static void html_tags_loaded(void);
static void load_user_tags(filetype_id ft_id);
-/* tags_ignore is a NULL-terminated array of strings, read from ~/.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. */
-gchar **c_tags_ignore = NULL;
+// get the tags_ignore list, exported by tagmanager's options.c
+extern gchar **c_tags_ignore;
static void load_c_ignore_tags(void)
{
Modified: trunk/src/symbols.h
===================================================================
--- trunk/src/symbols.h 2008-02-22 17:29:45 UTC (rev 2275)
+++ trunk/src/symbols.h 2008-02-24 10:18:36 UTC (rev 2276)
@@ -26,7 +26,6 @@
#define GEANY_SYMBOLS_H 1
extern const guint TM_GLOBAL_TYPE_MASK;
-extern gchar **c_tags_ignore;
void symbols_global_tags_loaded(gint file_type_idx);
Modified: trunk/tagmanager/options.c
===================================================================
--- trunk/tagmanager/options.c 2008-02-22 17:29:45 UTC (rev 2275)
+++ trunk/tagmanager/options.c 2008-02-24 10:18:36 UTC (rev 2276)
@@ -151,8 +151,10 @@
return FALSE;
}
-// get the tags_ignore list, exported by Geany's symbols.h
-extern gchar **c_tags_ignore;
+/* tags_ignore is a NULL-terminated array of strings, read from ~/.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. */
+gchar **c_tags_ignore = NULL;
/* Determines whether or not "name" should be ignored, per the ignore list.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2275
http://geany.svn.sourceforge.net/geany/?rev=2275&view=rev
Author: ntrel
Date: 2008-02-22 09:29:45 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
Don't scroll the editor view if it is unnecessary when using Go to
Marker or Go to Matching Brace commands.
Make sci_set_current_line() not scroll the view, unlike
sci_goto_line().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/keybindings.c
trunk/src/sciwrappers.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-22 13:30:16 UTC (rev 2274)
+++ trunk/ChangeLog 2008-02-22 17:29:45 UTC (rev 2275)
@@ -7,6 +7,11 @@
src/editor.h:
Don't scroll the editor view if it is unnecessary when using Find
Next/Previous, Find Selected and when searching from the search bar.
+ * src/keybindings.c, src/sciwrappers.c:
+ Don't scroll the editor view if it is unnecessary when using Go to
+ Marker or Go to Matching Brace commands.
+ Make sci_set_current_line() not scroll the view, unlike
+ sci_goto_line().
2008-02-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2008-02-22 13:30:16 UTC (rev 2274)
+++ trunk/src/keybindings.c 2008-02-22 17:29:45 UTC (rev 2275)
@@ -1135,8 +1135,8 @@
new_pos = sci_find_bracematch(doc_list[idx].sci, pos);
if (new_pos != -1)
{
- sci_goto_pos(doc_list[idx].sci, new_pos, TRUE); // set the cursor at the brace
- doc_list[idx].scroll_percent = 0.5F;
+ sci_set_current_position(doc_list[idx].sci, new_pos, FALSE); // set the cursor at the brace
+ editor_display_current_line(idx, 0.5F);
}
}
@@ -1187,8 +1187,8 @@
if (mline != -1)
{
- sci_goto_line(doc_list[idx].sci, mline, TRUE);
- doc_list[idx].scroll_percent = 0.5F;
+ sci_set_current_line(doc_list[idx].sci, mline);
+ editor_display_current_line(idx, 0.5F);
}
break;
}
@@ -1198,8 +1198,8 @@
if (mline != -1)
{
- sci_goto_line(doc_list[idx].sci, mline, TRUE);
- doc_list[idx].scroll_percent = 0.5F;
+ sci_set_current_line(doc_list[idx].sci, mline);
+ editor_display_current_line(idx, 0.5F);
}
break;
}
Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c 2008-02-22 13:30:16 UTC (rev 2274)
+++ trunk/src/sciwrappers.c 2008-02-22 17:29:45 UTC (rev 2275)
@@ -401,9 +401,12 @@
}
-void sci_set_current_line(ScintillaObject* sci, gint line )
+/* Set the cursor line without scrolling the view.
+ * Use sci_goto_line() to also scroll. */
+void sci_set_current_line(ScintillaObject* sci, gint line)
{
- SSM(sci, SCI_GOTOLINE, line, 0);
+ gint pos = sci_get_position_from_line(sci, line);
+ sci_set_current_position(sci, pos, FALSE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2273
http://geany.svn.sourceforge.net/geany/?rev=2273&view=rev
Author: ntrel
Date: 2008-02-22 05:16:07 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
Add note about writing ISO C90 code and not using C++ style comments.
Modified Paths:
--------------
trunk/HACKING
Modified: trunk/HACKING
===================================================================
--- trunk/HACKING 2008-02-22 12:30:52 UTC (rev 2272)
+++ trunk/HACKING 2008-02-22 13:16:07 UTC (rev 2273)
@@ -53,14 +53,17 @@
so we always declare variables before statements. You can use
-Wdeclaration-after-statement in your ./configure CFLAGS to warn about
this.
+You should also try to write ISO C90 code for portability, so always
+use C /* */ comments and function_name(void) instead of function_name().
+This is for compatibility with various Unix-like compilers.
Style
-----
We use a tab width of 4 and indent completely with tabs not spaces.
-To comment small blocks of code we use the C++ // comments and for
-functions descriptions or longer explanations of code, the multiline
-comment /* */ should be used. In any case, the more comments are in your
-code the better.
+Use the multiline comment /* */ to comment small blocks of code,
+functions descriptions or longer explanations of code, etc. C++ single
+line comments will cause portability issues. The more comments are in
+your code the better.
Lines should not be longer than about 100 characters and after 100
characters the lines should be wrapped and more indented than the first
line to highlight that the line is continued. We avoid putting spaces
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2272
http://geany.svn.sourceforge.net/geany/?rev=2272&view=rev
Author: ntrel
Date: 2008-02-22 04:30:52 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
Use extern for c_tags_ignore declaration to avoid allocating a
second copy of it (patch by Daniel Richard G., thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/options.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-22 09:56:31 UTC (rev 2271)
+++ trunk/ChangeLog 2008-02-22 12:30:52 UTC (rev 2272)
@@ -1,3 +1,10 @@
+2008-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/options.c:
+ Use extern for c_tags_ignore declaration to avoid allocating a
+ second copy of it (patch by Daniel Richard G., thanks).
+
+
2008-02-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* scintilla/Makefile.am, src/Makefile.am:
Modified: trunk/tagmanager/options.c
===================================================================
--- trunk/tagmanager/options.c 2008-02-22 09:56:31 UTC (rev 2271)
+++ trunk/tagmanager/options.c 2008-02-22 12:30:52 UTC (rev 2272)
@@ -152,7 +152,7 @@
}
// get the tags_ignore list, exported by Geany's symbols.h
-gchar **c_tags_ignore;
+extern gchar **c_tags_ignore;
/* Determines whether or not "name" should be ignored, per the ignore list.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2269
http://geany.svn.sourceforge.net/geany/?rev=2269&view=rev
Author: eht16
Date: 2008-02-21 07:51:50 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
Rename hidden pref auto_complete_whilst_editing to complete_snippets_whilst_editing.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/editor.c
trunk/src/editor.h
trunk/src/keyfile.c
trunk/src/plugindata.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/ChangeLog 2008-02-21 15:51:50 UTC (rev 2269)
@@ -1,3 +1,11 @@
+2008-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * doc/geany.html, doc/geany.txt, src/editor.c, src/editor.h,
+ src/keyfile.csrc/plugindata.h:
+ Rename hidden pref auto_complete_whilst_editing to
+ complete_snippets_whilst_editing.
+
+
2008-02-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* plugins/*, src/*, tagmanager/*:
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/doc/geany.html 2008-02-21 15:51:50 UTC (rev 2269)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2008-02-16" />
+<meta name="date" content="2008-02-18" />
<style type="text/css">
/*
@@ -133,7 +133,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2008-02-16</td></tr>
+<td>2008-02-18</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.14</td></tr>
</tbody>
@@ -2851,9 +2851,9 @@
configuration file.</p>
<table border="1" class="docutils">
<colgroup>
-<col width="33%" />
-<col width="48%" />
-<col width="20%" />
+<col width="34%" />
+<col width="46%" />
+<col width="19%" />
</colgroup>
<thead valign="bottom">
<tr><th class="head">Key</th>
@@ -2877,8 +2877,8 @@
<td>true</td>
</tr>
<tr><td>use_tab_to_indent</td>
-<td>Whether pressing tab when a line is selected
-will indent the line.</td>
+<td>Whether pressing tab when a line is
+selected will indent the line.</td>
<td>true</td>
</tr>
<tr><td>use_gtk_word_boundaries</td>
@@ -2888,9 +2888,11 @@
commands</a>).</td>
<td>true</td>
</tr>
-<tr><td>auto_complete_whilst_editing</td>
-<td>Whether to allow autocompletion when editing
-an existing line.</td>
+<tr><td>complete_snippets_whilst_editing</td>
+<td>Whether to allow completion of snippets
+when editing an existing line (i.e. there
+is some text after the current cursor
+position on the line).</td>
<td>false</td>
</tr>
<tr><td>scroll_stop_at_last_line</td>
@@ -3426,7 +3428,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-02-18 19:50 UTC.
+Generated on: 2008-02-21 15:39 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/doc/geany.txt 2008-02-21 15:51:50 UTC (rev 2269)
@@ -2521,28 +2521,30 @@
The table below show the key names of hidden preferences in the
configuration file.
-============================== ============================================ ==================
-Key Description Default
-============================== ============================================ ==================
+================================ =========================================== ==================
+Key Description Default
+================================ =========================================== ==================
**[editor]**
-brace_match_ltgt Whether to highlight <, > angle brackets. false
-show_editor_scrollbars Whether to display scrollbars. If set to true
- false, the horizontal and vertical
- scrollbars are hidden completely.
-use_tab_to_indent Whether pressing tab when a line is selected true
- will indent the line.
-use_gtk_word_boundaries Whether to look for the end of a word when true
- using word-boundary related Scintilla
- commands (see `Scintilla keyboard
- commands`_).
-auto_complete_whilst_editing Whether to allow autocompletion when editing false
- an existing line.
-scroll_stop_at_last_line Disable scrolling past end of document false
+brace_match_ltgt Whether to highlight <, > angle brackets. false
+show_editor_scrollbars Whether to display scrollbars. If set to true
+ false, the horizontal and vertical
+ scrollbars are hidden completely.
+use_tab_to_indent Whether pressing tab when a line is true
+ selected will indent the line.
+use_gtk_word_boundaries Whether to look for the end of a word when true
+ using word-boundary related Scintilla
+ commands (see `Scintilla keyboard
+ commands`_).
+complete_snippets_whilst_editing Whether to allow completion of snippets false
+ when editing an existing line (i.e. there
+ is some text after the current cursor
+ position on the line).
+scroll_stop_at_last_line Disable scrolling past end of document false
**[interface]**
-show_symbol_list_expanders Whether to show or hide the small expander true
- icons on the symbol list treeview (only
- available with GTK 2.12 or above).
-============================== ============================================ ==================
+show_symbol_list_expanders Whether to show or hide the small expander true
+ icons on the symbol list treeview (only
+ available with GTK 2.12 or above).
+================================ =========================================== ==================
Compile-time options
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/src/editor.c 2008-02-21 15:51:50 UTC (rev 2269)
@@ -1288,7 +1288,7 @@
sci = doc_list[idx].sci;
// return if we are editing an existing line (chars on right of cursor)
- if (! editor_prefs.auto_complete_whilst_editing && ! at_eol(sci, pos))
+ if (! editor_prefs.complete_snippets_whilst_editing && ! at_eol(sci, pos))
return FALSE;
lexer = SSM(sci, SCI_GETLEXER, 0, 0);
Modified: trunk/src/editor.h
===================================================================
--- trunk/src/editor.h 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/src/editor.h 2008-02-21 15:51:50 UTC (rev 2269)
@@ -76,7 +76,7 @@
GHashTable *snippets;
gboolean brace_match_ltgt; // whether to highlight < and > chars (hidden pref)
gboolean use_gtk_word_boundaries; // hidden pref
- gboolean auto_complete_whilst_editing; // hidden pref
+ gboolean complete_snippets_whilst_editing; // hidden pref
gboolean detect_tab_mode;
} EditorPrefs;
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/src/keyfile.c 2008-02-21 15:51:50 UTC (rev 2269)
@@ -370,7 +370,7 @@
write_hidden_pref_boolean(config, PACKAGE, "use_tab_to_indent", editor_prefs.use_tab_to_indent);
write_hidden_pref_boolean(config, PACKAGE, "brace_match_ltgt", editor_prefs.brace_match_ltgt);
write_hidden_pref_boolean(config, PACKAGE, "use_gtk_word_boundaries", editor_prefs.use_gtk_word_boundaries);
- write_hidden_pref_boolean(config, PACKAGE, "auto_complete_whilst_editing", editor_prefs.auto_complete_whilst_editing);
+ write_hidden_pref_boolean(config, PACKAGE, "complete_snippets_whilst_editing", editor_prefs.complete_snippets_whilst_editing);
write_hidden_pref_boolean(config, PACKAGE, "scroll_stop_at_last_line", editor_prefs.scroll_stop_at_last_line);
#if GTK_CHECK_VERSION(2, 12, 0)
write_hidden_pref_boolean(config, PACKAGE, "show_symbol_list_expanders", prefs.show_symbol_list_expanders);
@@ -528,7 +528,7 @@
editor_prefs.smart_home_key = utils_get_setting_boolean(config, PACKAGE, "pref_editor_smart_home_key", TRUE);
editor_prefs.newline_strip = utils_get_setting_boolean(config, PACKAGE, "pref_editor_newline_strip", FALSE);
editor_prefs.use_gtk_word_boundaries = utils_get_setting_boolean(config, PACKAGE, "use_gtk_word_boundaries", TRUE);
- editor_prefs.auto_complete_whilst_editing = utils_get_setting_boolean(config, PACKAGE, "auto_complete_whilst_editing", FALSE);
+ editor_prefs.complete_snippets_whilst_editing = utils_get_setting_boolean(config, PACKAGE, "complete_snippets_whilst_editing", FALSE);
editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", FALSE);
// Files
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2008-02-20 12:36:59 UTC (rev 2268)
+++ trunk/src/plugindata.h 2008-02-21 15:51:50 UTC (rev 2269)
@@ -36,7 +36,7 @@
/* The API version should be incremented whenever any plugin data types below are
* modified or appended to. */
-static const gint api_version = 43;
+static const gint api_version = 44;
/* The ABI version should be incremented whenever existing fields in the plugin
* data types below have to be changed or reordered. It should stay the same if fields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.