diff options
| author | Jim Fehrle | 2019-05-07 12:04:34 -0700 |
|---|---|---|
| committer | Jim Fehrle | 2019-05-07 14:27:47 -0700 |
| commit | 21e5a5d510de59a33f3e6a0f88b8321ac0d7d23d (patch) | |
| tree | ac4aa8969fdb4277880b1a29c5c05e0c1ce4c2a5 | |
| parent | e30d52a3c724a71bf43b46416c09e4b6ef1d1f67 (diff) | |
Show diffs in error messages only if Diffs is enabled
| -rw-r--r-- | test-suite/output/Error_msg_diffs.v | 2 | ||||
| -rw-r--r-- | vernac/himsg.ml | 1 |
2 files changed, 2 insertions, 1 deletions
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 |