diff options
| author | herbelin | 2001-09-20 14:33:55 +0000 |
|---|---|---|
| committer | herbelin | 2001-09-20 14:33:55 +0000 |
| commit | 9c5ea6376c22187e1185e187e140d5c1765305c2 (patch) | |
| tree | d1d4ff9d1e503a819c2bddd3f57d83064ffed5bc | |
| parent | fd1088cfa83a01d9139bd7bbdd112cdff4ca1b9a (diff) | |
Pas de warning pour le -I . par défaut de Coq
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2023 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | library/library.ml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/library/library.ml b/library/library.ml index d26c76b60f..f0c02780bc 100644 --- a/library/library.ml +++ b/library/library.ml @@ -67,13 +67,18 @@ let add_load_path_entry (phys_path,coq_path) = let phys_path = canonical_path_name phys_path in match list_filter2 (fun p d -> p = phys_path) !load_path with | _,[dir] -> - if coq_path <> dir then + if coq_path <> dir + (* If this is not the default -I . to coqtop *) + && phys_path <> canonical_path_name Filename.current_dir_name + && coq_path <> Nametab.default_root_prefix + then begin (* Assume the user is concerned by module naming *) if dir <> Nametab.default_root_prefix then - Options.if_verbose warning (phys_path^" was previously bound to " + (Options.if_verbose warning (phys_path^" was previously bound to " ^(string_of_dirpath dir) ^("\nIt is remapped to "^(string_of_dirpath coq_path))); + flush_all ()); remove_path phys_path; load_path := (phys_path::fst !load_path, coq_path::snd !load_path) end |