diff options
| author | Pierre-Marie Pédrot | 2017-02-01 10:36:24 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2017-02-01 10:48:25 +0100 |
| commit | 568b38e1d599f8bac5adf140f5a114f2871bc436 (patch) | |
| tree | f033e92941edde3b4287213c19cb7cd5a0c47f45 /ltac | |
| parent | a54dccb53fa8d6c12745b5f7b2c3c993a915b5bd (diff) | |
| parent | f5923c2174fbb419397f127af31ab1cd0b223e0a (diff) | |
Merge branch 'v8.5' into v8.6
Diffstat (limited to 'ltac')
| -rw-r--r-- | ltac/tacinterp.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ltac/tacinterp.ml b/ltac/tacinterp.ml index 20dbc2be4a..aa45f1ccf5 100644 --- a/ltac/tacinterp.ml +++ b/ltac/tacinterp.ml @@ -957,7 +957,7 @@ let interp_or_and_intro_pattern_option ist env sigma = function (match coerce_to_intro_pattern env (Id.Map.find id ist.lfun) with | IntroAction (IntroOrAndPattern l) -> sigma, Some (loc,l) | _ -> - raise (CannotCoerceTo "a disjunctive/conjunctive introduction pattern")) + user_err_loc (loc,"", str "Cannot coerce to a disjunctive/conjunctive pattern.")) | Some (ArgArg (loc,l)) -> let sigma,l = interp_or_and_intro_pattern ist env sigma l in sigma, Some (loc,l) |