diff options
| author | Emilio Jesus Gallego Arias | 2019-08-09 00:00:27 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-08-09 00:00:27 +0200 |
| commit | b8477fb38842016c226ba9d7be8f60486411a2ee (patch) | |
| tree | 0e0eee6924d097d1e684dea70745ce09ce74ea8f | |
| parent | 0146ca2b11a255cbfe2868923b80376a61cc05de (diff) | |
| parent | 272ed89ed0120b68014ea0a59b40c396fa241b29 (diff) | |
Merge PR #10641: Fix regression of #10637 (-emacs arg should set color to `EMACS)
Reviewed-by: ejgallego
| -rw-r--r-- | test-suite/output/Emacs_and_diffs.out | 0 | ||||
| -rw-r--r-- | test-suite/output/Emacs_and_diffs.v | 3 | ||||
| -rw-r--r-- | toplevel/coqargs.ml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/test-suite/output/Emacs_and_diffs.out b/test-suite/output/Emacs_and_diffs.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test-suite/output/Emacs_and_diffs.out diff --git a/test-suite/output/Emacs_and_diffs.v b/test-suite/output/Emacs_and_diffs.v new file mode 100644 index 0000000000..c35fd1a11b --- /dev/null +++ b/test-suite/output/Emacs_and_diffs.v @@ -0,0 +1,3 @@ +(* coq-prog-args: ("-emacs") *) +Set Diffs "on". +(* verify this does not produce an error message *) diff --git a/toplevel/coqargs.ml b/toplevel/coqargs.ml index eb0331d95e..67d70416c8 100644 --- a/toplevel/coqargs.ml +++ b/toplevel/coqargs.ml @@ -184,7 +184,7 @@ let add_load_vernacular opts verb s = (** Options for proof general *) let set_emacs opts = Printer.enable_goal_tags_printing := true; - { opts with config = { opts.config with color = `OFF; print_emacs = true }} + { opts with config = { opts.config with color = `EMACS; print_emacs = true }} let set_logic f oval = { oval with config = { oval.config with logic = f oval.config.logic }} |