diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
| commit | 8fde14879a7f9d6d6a60244e8f8000c123dd3115 (patch) | |
| tree | 34916cad79cb270959b576f3f46231db1b4d2231 /src/ui/inputwin.c | |
| parent | 637b8bee9fcaeedbb09636b76e34270abbfcab47 (diff) | |
| parent | a798dc5618580265e60f93be091b649b4bf86dee (diff) | |
| download | profani-tty-8fde14879a7f9d6d6a60244e8f8000c123dd3115.tar.gz | |
Merge branch 'master' into openpgp
Conflicts: src/command/commands.c src/command/commands.h
Diffstat (limited to 'src/ui/inputwin.c')
| -rw-r--r-- | src/ui/inputwin.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 57814414..e29cec6c 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -415,7 +415,8 @@ _inp_rl_getc(FILE *stream) { int ch = rl_getc(stream); if (_inp_printable(ch)) { - cmd_reset_autocomplete(); + ProfWin *window = wins_get_current(); + cmd_reset_autocomplete(window); } return ch; } @@ -435,14 +436,16 @@ _inp_rl_tab_handler(int count, int key) return 0; } - if ((strncmp(rl_line_buffer, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) { - char *result = muc_autocomplete(rl_line_buffer); + ProfWin *current = wins_get_current(); + if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) { + char *result = muc_autocomplete(current, rl_line_buffer); if (result) { rl_replace_line(result, 0); rl_point = rl_end; } } else if (strncmp(rl_line_buffer, "/", 1) == 0) { - char *result = cmd_autocomplete(rl_line_buffer); + ProfWin *window = wins_get_current(); + char *result = cmd_autocomplete(window, rl_line_buffer); if (result) { rl_replace_line(result, 0); rl_point = rl_end; |