diff options
| author |  Thomas Hebb <tommyhebb@gmail.com> | 2018-03-07 13:47:57 -0500 |
|---|---|---|
| committer | Thomas Hebb <tommyhebb@gmail.com> | 2018-03-07 13:53:04 -0500 |
| commit | 296fd47808c5642903a81bf6a87bf291ae15abfd (patch) | |
| tree | 1fe8a0e78cf5de7b826cfa2f584e224bfe94f147 /vernac/topfmt.ml | |
| parent | 144517d764f11b8b79e8f7adfeca0d075dd4ac19 (diff) | |
[toplevel] Respect COQ_COLORS environment variable
Since 3fc02bb2034a ("[pp] Move terminal-specific tagging to the
toplevel."), the COQ_COLORS environment variable has been ignored,
since init_terminal_output unconditionally called init_tag_map with
the default colors, overwriting any custom colors that had been
previously set. Fix this by creating a separate function,
default_styles, to set the default colors.
Also, remove the clear_styles function, as it was only called in one
place and did nothing (since tag_map is empty to begin with).
Diffstat (limited to 'vernac/topfmt.ml')
| -rw-r--r-- | vernac/topfmt.ml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vernac/topfmt.ml b/vernac/topfmt.ml index 4e4077f42..055f6676e 100644 --- a/vernac/topfmt.ml +++ b/vernac/topfmt.ml @@ -187,8 +187,8 @@ let init_tag_map styles = let set accu (name, st) = CString.Map.add name st accu in tag_map := List.fold_left set !tag_map styles -let clear_styles () = - tag_map := CString.Map.empty +let default_styles () = + init_tag_map (default_tag_map ()) let parse_color_config file = let styles = Terminal.parse file in @@ -257,7 +257,6 @@ let make_printing_functions () = print_prefix, print_suffix let init_terminal_output ~color = - init_tag_map (default_tag_map ()); let push_tag, pop_tag, clear_tag = make_style_stack () in let print_prefix, print_suffix = make_printing_functions () in let tag_handler ft = { |