Merge branch 'master' into inp-utf8

This commit is contained in:
James Booth
2015-01-16 23:39:34 +00:00

View File

@@ -573,14 +573,12 @@ _handle_edit(int key_type, const wint_t ch)
if ((strncmp(input, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) { if ((strncmp(input, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) {
char *result = muc_autocomplete(input); char *result = muc_autocomplete(input);
if (result) { if (result) {
cons_debug("ac result = %s", result);
inp_replace_input(result); inp_replace_input(result);
free(result); free(result);
} }
} else if (strncmp(input, "/", 1) == 0) { } else if (strncmp(input, "/", 1) == 0) {
char *result = cmd_autocomplete(input); char *result = cmd_autocomplete(input);
if (result) { if (result) {
cons_debug("ac result = %s", result);
inp_replace_input(result); inp_replace_input(result);
free(result); free(result);
} }