Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Emit omitted-newline string before fish_prompt event

Browse source 
See issue #6118 "omitted-newline string emitted after fish_prompt event"
This commit is contained in:
Per Bothner 2019-09-29 22:09:26 -07:00 committed by ridiculousfish
parent dfc45f3e10
commit afb8f42f39
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/reader.cpp
View file

@ -2258,7 +2258,6 @@ static int read_i(parser_t &parser) {
data->prev_end_loop = 0; data->prev_end_loop = 0;
while (!shell_is_exiting()) { while (!shell_is_exiting()) {
event_fire_generic(parser, L"fish_prompt");
run_count++; run_count++;
if (parser.libdata().is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) { if (parser.libdata().is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
@ -3207,10 +3206,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
history_search.reset(); history_search.reset();
s_reset(&screen, screen_reset_abandon_line);
event_fire_generic(parser(), L"fish_prompt");
exec_prompt(); exec_prompt();
super_highlight_me_plenty(); super_highlight_me_plenty();
s_reset(&screen, screen_reset_abandon_line);
repaint(); repaint();
// Get the current terminal modes. These will be restored when the function returns. // Get the current terminal modes. These will be restored when the function returns.