aboutsummaryrefslogtreecommitdiff
path: root/toplevel
diff options
context:
space:
mode:
authorHugo Herbelin2016-10-09 08:18:52 +0200
committerHugo Herbelin2016-10-09 08:48:13 +0200
commiteb87cdaeb252d758b6a76b36867254823169576b (patch)
tree2b1345ba106bd75c6c889524d616ef1062b20237 /toplevel
parent0a6f0c161756a1878dd81e438df86f08631d8399 (diff)
A tentative fix for #5102 (bullets parsing broken by calls to parse_entry).
More precisely, commands that calls parse_entry put the lexer in an inconsistent state, breaking the lexing of bullet which relies on it. (Not to be pushed to v8.6 which has a better fix).
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/vernac.ml4
1 files changed, 3 insertions, 1 deletions
diff --git a/toplevel/vernac.ml b/toplevel/vernac.ml
index 1f7b947e93..177f3c775b 100644
--- a/toplevel/vernac.ml
+++ b/toplevel/vernac.ml
@@ -230,7 +230,9 @@ let rec vernac_com checknav (loc,com) =
if do_beautify () then pr_new_syntax loc (Some com);
if !Flags.time then display_cmd_header loc com;
let com = if !Flags.time then VernacTime [loc,com] else com in
- interp com
+ let a = Lexer.com_state () in
+ interp com;
+ Lexer.restore_com_state a
with reraise ->
let (reraise, info) = Errors.push reraise in
Format.set_formatter_out_channel stdout;