mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

complete.c: Fix autocompletion for single possible path when "complete

Browse Source 
show all" is set.
This commit is contained in:
Leonard den Ottolander 2005-07-06 11:16:08 +00:00
parent bb14c4e1da
commit 674dac483d
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-06 Pavel Tsekov <ptsekov@gmx.net>
* complete.c: Fix autocompletion for single possible path when
"complete show all" is set.
2005-07-05 Roland Illig <roland.illig@gmx.de>
* achown.c: Changed all references to umode_t into mode_t.

26
src/complete.c
View File

@ -922,7 +922,7 @@ complete_engine (WInput *in, int what_to_do)
in->completions = try_complete (in->buffer, &start, &end, in->completion_flags);
}
if (in->completions){
if (what_to_do & DO_INSERTION) {
if (what_to_do & DO_INSERTION || ((what_to_do & DO_QUERY) && !in->completions[1])) {
if (insert_text (in, in->completions [0], strlen (in->completions [0]))){
if (in->completions [1])
beep ();
@ -931,11 +931,7 @@ complete_engine (WInput *in, int what_to_do)
} else
beep ();
}
/* FIXME: evil evil evil. We do not go into the query completion engine
* because we do not have a Gtk dialog for it. Gtk-ted does not like
* this; if we enable this code, it will crash.
*/
if ((what_to_do & DO_QUERY) && in->completions [1]) {
if ((what_to_do & DO_QUERY) && in->completions && in->completions [1]) {
int maxlen = 0, i, count = 0;
int x, y, w, h;
int start_x, start_y;
@ -1000,11 +996,17 @@ complete_engine (WInput *in, int what_to_do)
void complete (WInput *in)
{
int engine_flags;
if (in->completions)
while (complete_engine (in, DO_QUERY));
else if (show_all_if_ambiguous){
complete_engine (in, DO_INSERTION);
while (complete_engine (in, DO_QUERY));
} else
complete_engine (in, DO_INSERTION);
engine_flags = DO_QUERY;
else
{
engine_flags = DO_INSERTION;
if (show_all_if_ambiguous)
engine_flags |= DO_QUERY;
}
while (complete_engine (in, engine_flags));
}