[PATCH v2] launch_editor: waiting message on error
- From
Rubén Justo <rjusto@gmail.com>
- Date
- Apr 8, 2024, 23:09 UTC
- Message-ID
- <0258a583-a90a-4434-bb4e-a1672d574b9c@gmail.com>
- In-Reply-To
- <96bef5f9-1286-4938-99ec-6beed13ee68d@gmail.com>
We have the hint we're touching in this commit since abfb04d0c7 (launch_editor(): indicate that Git waits for user input, 2017-12-07).
Adding a new line after the hint when the editor returns error was discussed in the list, but finally it was considered not necessary because a shorter message is used [1].
However, even with a short message, feeding that LF makes the following "error: There was a problem with the..." clearer, separating it from possible messages that the editor could have printed. So, add that LF.
While we're here, make the error message follow our CodingGuideLines.
[1] https://public-inbox.org/git/20171127134716.69471-1-lars.schneider@autodesk.com/T/#u
Signed-off-by: Rubén Justo <rjusto@gmail.com> ---
This v2 fixes some whitespaces I didn't notice.
Sorry for the mess.
editor.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/editor.c b/editor.c index b67b802ddf..8f224747d9 100644 --- a/editor.c +++ b/editor.c @@ -104,16 +104,26 @@ static int launch_specified_editor(const char *editor, const char *path, sigchain_pop(SIGQUIT); if (sig == SIGINT || sig == SIGQUIT) raise(sig); + + if (print_waiting_for_editor && !is_terminal_dumb()) { + if (!ret) + /* + * Erase the entire line to avoid wasting + * the vertical space. + */ + term_clear_line(); + else + /* + * We don't want term_clear_line() here + * because the editor could have written + * some useful messages to the user. + */ + fprintf(stderr, "\n"); + } + if (ret) - return error("There was a problem with the editor '%s'.", + return error("there was a problem with the editor '%s'", editor); - - if (print_waiting_for_editor && !is_terminal_dumb()) - /* - * Erase the entire line to avoid wasting the - * vertical space. - */ - term_clear_line(); } if (!buffer)
-- 2.44.0.502.g3e6838d230