1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into plugins

This commit is contained in:
James Booth 2014-07-09 01:06:11 +01:00
commit ddebfaae64
2 changed files with 6 additions and 6 deletions

View File

@ -581,7 +581,6 @@ muc_autocomplete(char *input, int *size)
result = autocomplete_complete(nick_ac, input);
} else {
int len = (last_space - input);
cons_debug("SIZE: %d", len);
char *start_str = strndup(input, len);
result = autocomplete_param_with_ac(input, size, start_str, nick_ac);
free(start_str);

View File

@ -512,11 +512,12 @@ _handle_edit(int result, const wint_t ch, char *input, int *size)
return 1;
case 9: // tab
if ((strncmp(input, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) {
cons_debug("MUC AC");
muc_autocomplete(input, size);
} else {
cmd_autocomplete(input, size);
if (*size != 0) {
if ((strncmp(input, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) {
muc_autocomplete(input, size);
} else if (strncmp(input, "/", 1) == 0) {
cmd_autocomplete(input, size);
}
}
return 1;