From afb8f42f39b370eb52771ec04d093755290c1737 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Sun, 29 Sep 2019 22:09:26 -0700
Subject: [PATCH] Emit omitted-newline string before fish_prompt event

See issue #6118 "omitted-newline string emitted after fish_prompt event"
---
 src/reader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index d7a6dc6a4..2cb60c977 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2258,7 +2258,6 @@ static int read_i(parser_t &parser) {
     data->prev_end_loop = 0;
 
     while (!shell_is_exiting()) {
-        event_fire_generic(parser, L"fish_prompt");
         run_count++;
 
         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();
 
+    s_reset(&screen, screen_reset_abandon_line);
+    event_fire_generic(parser(), L"fish_prompt");
     exec_prompt();
 
     super_highlight_me_plenty();
-    s_reset(&screen, screen_reset_abandon_line);
     repaint();
 
     // Get the current terminal modes. These will be restored when the function returns.