Don't report an error when diff-highlight is killed intentionally

jonas · Oct 28, 2024 · cc7479d · cc7479d
1 parent 914c617
commit cc7479d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/NEWS.adoc b/NEWS.adoc
@@ -10,6 +10,7 @@ Bug fixes:
  - Fix `Ctrl-C` behavior within the Readline prompt. (#1342)
  - Fix message upon edit from diffstat without patch.
  - Fix missing dates in the refs view.
+ - Don't report an error when diff-highlight is killed intentionally.
 
 Improvements:
 

diff --git a/src/diff.c b/src/diff.c
@@ -520,7 +520,8 @@ diff_read(struct view *view, struct buffer *buf, bool force_stop)
 
 	if (!buf) {
 		if (!diff_done_highlight(state)) {
-			report("Failed run the diff-highlight program: %s", opt_diff_highlight);
+			if (!force_stop)
+				report("Failed to run the diff-highlight program: %s", opt_diff_highlight);
 			return false;
 		}
 

diff --git a/src/pager.c b/src/pager.c
@@ -142,7 +142,8 @@ pager_read(struct view *view, struct buffer *buf, bool force_stop)
 
 	if (!buf) {
 		if (!diff_done_highlight(view->private)) {
-			report("Failed run the diff-highlight program: %s", opt_diff_highlight);
+			if (!force_stop)
+				report("Failed to run the diff-highlight program: %s", opt_diff_highlight);
 			return false;
 		}
 

diff --git a/src/stage.c b/src/stage.c
@@ -798,7 +798,8 @@ stage_read(struct view *view, struct buffer *buf, bool force_stop)
 
 	if (!buf) {
 		if (!diff_done_highlight(&state->diff)) {
-			report("Failed run the diff-highlight program: %s", opt_diff_highlight);
+			if (!force_stop)
+				report("Failed to run the diff-highlight program: %s", opt_diff_highlight);
 			return false;
 		}