diff options
| -rw-r--r-- | lib/system.ml | 8 | ||||
| -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 |
4 files changed, 11 insertions, 2 deletions
diff --git a/lib/system.ml b/lib/system.ml index 46b358f825..b1a9efccfc 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -53,8 +53,14 @@ module StrSet = Set.Make(StrMod) let dirmap = ref StrMap.empty let make_dir_table dir = + let entries = + try + Sys.readdir dir + with Sys_error _ -> + warn_cannot_open_dir dir; + [||] in let filter_dotfiles s f = if f.[0] = '.' then s else StrSet.add f s in - Array.fold_left filter_dotfiles StrSet.empty (Sys.readdir dir) + Array.fold_left filter_dotfiles StrSet.empty entries (** Don't trust in interactive mode (the default) *) let trust_file_cache = ref false 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 }} |