Skip to content

Commit

Permalink
editor: save and reset terminal after calling EDITOR
Browse files Browse the repository at this point in the history
When EDITOR is invoked to modify a commit message, it will likely
change the terminal settings, and if it misbehaves will leave the
terminal output as shown in microsoft/terminal#9359.

Instead use the recently added {push,pop}_term() functions to save
the terminal configuration and recover safely.

[1] microsoft/terminal#9359

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
  • Loading branch information
carenas committed Oct 2, 2021
1 parent c4781fc commit e995883
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions editor.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "strbuf.h"
#include "run-command.h"
#include "sigchain.h"
#include "compat/terminal.h"

#ifndef DEFAULT_EDITOR
#define DEFAULT_EDITOR "vi"
Expand Down Expand Up @@ -83,14 +84,17 @@ static int launch_specified_editor(const char *editor, const char *path,
p.env = env;
p.use_shell = 1;
p.trace2_child_class = "editor";
push_term(1);
if (start_command(&p) < 0) {
pop_term();
strbuf_release(&realpath);
return error("unable to start editor '%s'", editor);
}

sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
pop_term();
strbuf_release(&realpath);
sig = ret - 128;
sigchain_pop(SIGINT);
Expand Down

0 comments on commit e995883

Please sign in to comment.