summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2008-10-10 14:02:25 +0200
committerSebastien Helleu <flashcode@flashtux.org>2008-10-10 14:02:25 +0200
commit80018210ebc97112c37ece4a3f4109bf97731530 (patch)
tree542b06aea3abf0bc4294450e4fd6dbed2646922d
parent5d07aa14ed58bb7ba3a4566955d471861488f056 (diff)
downloadweechat-80018210ebc97112c37ece4a3f4109bf97731530.zip
Use key shift-tab to force partial completion (when no completion is pending), remove automatic partial completion on option names
Behaviour of shift-key stays the same if there's a completion found, it completes with previous completion found.
-rw-r--r--doc/de/usage.de.xml10
-rw-r--r--doc/en/usage.en.xml9
-rw-r--r--doc/fr/usage.fr.xml10
-rw-r--r--src/gui/gui-completion.c3
4 files changed, 27 insertions, 5 deletions
diff --git a/doc/de/usage.de.xml b/doc/de/usage.de.xml
index c839bf129..dff4725b4 100644
--- a/doc/de/usage.de.xml
+++ b/doc/de/usage.de.xml
@@ -297,12 +297,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</entry>
</row>
<row>
- <entry>Tabulator / Shift + Tabulator</entry>
+ <entry>Tabulator</entry>
<entry>
Vervollständige ein Kommando oder Nick
(wiederhole: finde nächste Vervollständigung)
</entry>
</row>
+ <!-- TRANSLATION NEEDED -->
+ <row>
+ <entry>Shift + Tab</entry>
+ <entry>
+ Without completion, do a partial completion.
+ With pending completion, complete with previous completion.
+ </entry>
+ </row>
<row>
<entry>Jedes Zeichen</entry>
<entry>
diff --git a/doc/en/usage.en.xml b/doc/en/usage.en.xml
index c453d0d58..f30dec2f6 100644
--- a/doc/en/usage.en.xml
+++ b/doc/en/usage.en.xml
@@ -281,13 +281,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</entry>
</row>
<row>
- <entry>Tab / Shift + Tab</entry>
+ <entry>Tab</entry>
<entry>
Complete command or nick
(Tab again: find next completion)
</entry>
</row>
<row>
+ <entry>Shift + Tab</entry>
+ <entry>
+ Without completion, do a partial completion.
+ With pending completion, complete with previous completion.
+ </entry>
+ </row>
+ <row>
<entry>Any char</entry>
<entry>
Insert char at cursor position in command line
diff --git a/doc/fr/usage.fr.xml b/doc/fr/usage.fr.xml
index a568189f7..430e6383f 100644
--- a/doc/fr/usage.fr.xml
+++ b/doc/fr/usage.fr.xml
@@ -301,13 +301,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</entry>
</row>
<row>
- <entry>Tab / Shift + Tab</entry>
+ <entry>Tab</entry>
<entry>
Compléter la commande ou le pseudo
(Tab de nouveau: trouver la complétion suivante)
</entry>
</row>
<row>
+ <entry>Shift + Tab</entry>
+ <entry>
+ Sans complétion, effectue une complétion partielle.
+ Avec une complétion en cours, complète avec la complétion
+ précécente.
+ </entry>
+ </row>
+ <row>
<entry>Tout caractère</entry>
<entry>
Insérer le caractère à la position du curseur
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index ef1b8f25e..f104d6119 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -592,8 +592,6 @@ gui_completion_list_add_option (struct t_gui_completion *completion)
int length;
char *option_full_name;
- completion->force_partial_completion = 1;
-
for (ptr_config = config_files; ptr_config;
ptr_config = ptr_config->next_config)
{
@@ -1567,6 +1565,7 @@ gui_completion_search (struct t_gui_completion *completion, int direction,
free (completion->word_found);
completion->word_found = NULL;
gui_completion_find_context (completion, data, size, pos);
+ completion->force_partial_completion = (direction < 0);
}
/* completion */