degesch: tiny fixes for the prompt hook

It should return valid UTF-8.

Also remember to refresh the prompt upon hook removal.
This commit is contained in:
Přemysl Eric Janouch 2016-10-29 19:41:41 +02:00
parent 0d499dd125
commit 568f9b7123
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 3 additions and 2 deletions

View File

@ -8796,6 +8796,7 @@ lua_hook_unhook (lua_State *L)
break; break;
case XLUA_HOOK_PROMPT: case XLUA_HOOK_PROMPT:
LIST_UNLINK (hook->plugin->ctx->prompt_hooks, &hook->data.hook); LIST_UNLINK (hook->plugin->ctx->prompt_hooks, &hook->data.hook);
refresh_prompt (hook->plugin->ctx);
break; break;
case XLUA_HOOK_COMPLETION: case XLUA_HOOK_COMPLETION:
LIST_UNLINK (hook->plugin->ctx->completion_hooks, &hook->data.hook); LIST_UNLINK (hook->plugin->ctx->completion_hooks, &hook->data.hook);
@ -8892,11 +8893,11 @@ lua_prompt_hook_make (struct prompt_hook *self)
char *prompt = xstrdup (""); char *prompt = xstrdup ("");
if (lua_plugin_call (plugin, 1, 1, &e)) if (lua_plugin_call (plugin, 1, 1, &e))
{ {
lua_plugin_handle_string_filter_result (plugin, &prompt, false, &e); lua_plugin_handle_string_filter_result (plugin, &prompt, true, &e);
lua_pop (L, 1); lua_pop (L, 1);
} }
if (e) if (e)
lua_plugin_log_error (plugin, "Prompt hook", e); lua_plugin_log_error (plugin, "prompt hook", e);
return prompt; return prompt;
} }