From 21e5a5d510de59a33f3e6a0f88b8321ac0d7d23d Mon Sep 17 00:00:00 2001
From: Jim Fehrle
Date: Tue, 7 May 2019 12:04:34 -0700
Subject: Show diffs in error messages only if Diffs is enabled

---
 test-suite/output/Error_msg_diffs.v | 2 +-
 vernac/himsg.ml                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test-suite/output/Error_msg_diffs.v b/test-suite/output/Error_msg_diffs.v
index 11c766b210..a26e683398 100644
--- a/test-suite/output/Error_msg_diffs.v
+++ b/test-suite/output/Error_msg_diffs.v
@@ -1,4 +1,4 @@
-(* coq-prog-args: ("-color" "on" "-async-proofs" "off") *)
+(* coq-prog-args: ("-color" "on" "-diffs" "on" "-async-proofs" "off") *)
 (* Re: -async-proofs off, see https://github.com/coq/coq/issues/9671 *)
 (* Shows diffs in an error message for an "Unable to unify" error *)
 Require Import Arith List Bool.
diff --git a/vernac/himsg.ml b/vernac/himsg.ml
index 082b22b373..f58eeae6dc 100644
--- a/vernac/himsg.ml
+++ b/vernac/himsg.ml
@@ -150,6 +150,7 @@ let explicit_flags =
     [print_universes; print_implicits; print_coercions; print_no_symbol] (* and more! *) ]
 
 let with_diffs pm pn =
+  if not (Proof_diffs.show_diffs ()) then pm, pn else
   try
     let tokenize_string = Proof_diffs.tokenize_string in
     Pp_diff.diff_pp ~tokenize_string pm pn
-- 
cgit v1.2.3