diff options
author | 2012-03-27 07:48:23 +0200 | |
---|---|---|
committer | 2012-03-27 07:48:23 +0200 | |
commit | ad988252cac876f0b9998b5223f565d0a22aebb8 (patch) | |
tree | 0c0e0cd5c943b3fbeb97c99cf46e19bbc97144c0 /pretyping/pretype_errors.ml | |
parent | 11b04078a227fd8849972d05417487520177fb04 (diff) | |
parent | 6e34b272d789455a9be589e27ad3a998cf25496b (diff) |
Merge tag 'upstream/8.3.pl4+dfsg'
Upstream version 8.3.pl4+dfsg
Diffstat (limited to 'pretyping/pretype_errors.ml')
-rw-r--r-- | pretyping/pretype_errors.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml index 688a25b9..a9b2a18b 100644 --- a/pretyping/pretype_errors.ml +++ b/pretyping/pretype_errors.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: pretype_errors.ml 14641 2011-11-06 11:59:10Z herbelin $ *) +(* $Id: pretype_errors.ml 15025 2012-03-09 14:27:07Z glondu $ *) open Util open Stdpp @@ -45,7 +45,7 @@ exception PretypeError of env * pretype_error let precatchable_exception = function | Util.UserError _ | TypeError _ | PretypeError _ - | Stdpp.Exc_located(_,(Util.UserError _ | TypeError _ | + | Compat.Exc_located(_,(Util.UserError _ | TypeError _ | Nametab.GlobalizationError _ | PretypeError _)) -> true | _ -> false |