From 18155d4813b450c667d5fbe3afe597740c388eff Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sat, 29 Mar 2014 00:43:07 -0400 Subject: [PATCH] Skip confirmation step when editor reports no error Instead of prompting the user to 'Press Enter to continue', drop directly back into last view after edit when no error was reported by the editor References #200 --- src/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display.c b/src/display.c index 982d99c..5b207f3 100644 --- a/src/display.c +++ b/src/display.c @@ -37,7 +37,7 @@ open_external_viewer(const char *argv[], const char *dir, bool confirm, const ch def_prog_mode(); /* save current tty modes */ endwin(); /* restore original tty modes */ ok = io_run_fg(argv, dir); - if (confirm) { + if (confirm || !ok) { if (!ok && *notice) fprintf(stderr, "%s", notice); fprintf(stderr, "Press Enter to continue"); @@ -84,7 +84,7 @@ open_editor(const char *file, unsigned int lineno) if (lineno && opt_editor_line_number && string_format(lineno_cmd, "+%u", lineno)) editor_argv[argc++] = lineno_cmd; editor_argv[argc] = file; - if (!open_external_viewer(editor_argv, repo.cdup, TRUE, EDITOR_LINENO_MSG)) + if (!open_external_viewer(editor_argv, repo.cdup, FALSE, EDITOR_LINENO_MSG)) opt_editor_line_number = FALSE; } -- 2.11.4.GIT