SF.net SVN: geany:[3943] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Thu Jul 9 11:54:17 UTC 2009
Revision: 3943
http://geany.svn.sourceforge.net/geany/?rev=3943&view=rev
Author: ntrel
Date: 2009-07-09 11:54:14 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
If autocompletion is already visible when forcing completion, show
document word completion instead of tag completion.
Docs: Minor edits of related prefs items.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-07-09 11:18:45 UTC (rev 3942)
+++ trunk/ChangeLog 2009-07-09 11:54:14 UTC (rev 3943)
@@ -3,6 +3,10 @@
* src/interface.c, src/keyfile.c, src/editor.c, src/editor.h,
doc/geany.txt, doc/geany.html, geany.glade:
Add 'Drop rest of word on completion' pref.
+ * src/editor.c, doc/geany.txt, doc/geany.html:
+ If autocompletion is already visible when forcing completion, show
+ document word completion instead of tag completion.
+ Docs: Minor edits of related prefs items.
2009-07-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2009-07-09 11:18:45 UTC (rev 3942)
+++ trunk/doc/geany.html 2009-07-09 11:54:14 UTC (rev 3943)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2009-07-08" />
+<meta name="date" content="2009-07-09" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2009-07-08</td></tr>
+<td>2009-07-09</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.18</td></tr>
</tbody>
@@ -2053,14 +2053,14 @@
are no tag names to show.</dd>
<dt>Drop rest of word on completion</dt>
<dd>Remove any word part to the right of the cursor when choosing a
-completion list entry.</dd>
-<dt>Characters to type for completion</dt>
+completion list item.</dd>
+<dt>Characters to type for autocompletion</dt>
<dd>Number of characters of a word to type before autocompletion is
displayed.</dd>
-<dt>Rows of symbol completion list</dt>
-<dd>The maximum number of symbols to show in the autocompletion window.</dd>
+<dt>Completion list height</dt>
+<dd>The number of rows to display for the autocompletion window.</dd>
<dt>Max. symbol name suggestions</dt>
-<dd>The maximum number of entries to display in the autocompletion list.</dd>
+<dd>The maximum number of items in the autocompletion list.</dd>
</dl>
</div>
<div class="section">
@@ -2780,7 +2780,11 @@
</tr>
<tr><td>Complete word</td>
<td>Ctrl-Space</td>
-<td>Shows autocompletion list.</td>
+<td>Shows the autocompletion list. If already showing
+tag completion, it shows document word completion
+instead, even if it is not enabled for automatic
+completion. Likewise if no tag suggestions are
+available, it shows document word completion.</td>
</tr>
<tr><td>Show calltip</td>
<td>Ctrl-Shift-Space</td>
@@ -4979,7 +4983,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2009-07-09 11:17 UTC.
+Generated on: 2009-07-09 11:51 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 2009-07-09 11:18:45 UTC (rev 3942)
+++ trunk/doc/geany.txt 2009-07-09 11:54:14 UTC (rev 3943)
@@ -1789,17 +1789,17 @@
Drop rest of word on completion
Remove any word part to the right of the cursor when choosing a
- completion list entry.
+ completion list item.
-Characters to type for completion
+Characters to type for autocompletion
Number of characters of a word to type before autocompletion is
displayed.
-Rows of symbol completion list
- The maximum number of symbols to show in the autocompletion window.
+Completion list height
+ The number of rows to display for the autocompletion window.
Max. symbol name suggestions
- The maximum number of entries to display in the autocompletion list.
+ The maximum number of items in the autocompletion list.
Auto-close quotes and brackets
@@ -2566,7 +2566,11 @@
Scroll down by one line Alt-Down Scrolls the view.
-Complete word Ctrl-Space Shows autocompletion list.
+Complete word Ctrl-Space Shows the autocompletion list. If already showing
+ tag completion, it shows document word completion
+ instead, even if it is not enabled for automatic
+ completion. Likewise if no tag suggestions are
+ available, it shows document word completion.
Show calltip Ctrl-Shift-Space Shows call tips for the current function or
method.
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2009-07-09 11:18:45 UTC (rev 3942)
+++ trunk/src/editor.c 2009-07-09 11:54:14 UTC (rev 3943)
@@ -1866,7 +1866,10 @@
* editor_prefs.symbolcompletion_min_chars'th char */
if (force || rootlen >= editor_prefs.symbolcompletion_min_chars)
{
- ret = autocomplete_tags(editor, root, rootlen);
+ /* complete tags, except if forcing when completion is already visible */
+ if (!(force && SSM(sci, SCI_AUTOCACTIVE, 0, 0)))
+ ret = autocomplete_tags(editor, root, rootlen);
+
/* If forcing and there's nothing else to show, complete from words in document */
if (!ret && (force || editor_prefs.autocomplete_doc_words))
ret = autocomplete_doc_word(editor, root, rootlen);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list