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.