diff options
| author | pboutill | 2011-11-21 16:58:23 +0000 |
|---|---|---|
| committer | pboutill | 2011-11-21 16:58:23 +0000 |
| commit | 885bddb65bd236d2e1e9e8c5a44cec688036213b (patch) | |
| tree | 0916fe71c291d8a46138681a7d1a6fc5c83d51ca /toplevel | |
| parent | 36404268502d43a657c1cdc4bcb7bbdc972b6c56 (diff) | |
/home/pirbo/.coqrc* are read again
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14714 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/coqinit.ml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml index d771228921..e4cfcb3f71 100644 --- a/toplevel/coqinit.ml +++ b/toplevel/coqinit.ml @@ -18,7 +18,8 @@ let set_debug () = Flags.debug := true rcfile is either $XDG_CONFIG_HOME/.coqrc.VERSION, or $XDG_CONFIG_HOME/.coqrc if the first one does not exist. *) -let rcfile = ref (Envars.xdg_config_home/"coqrc") +let rcdefaultname = "coqrc" +let rcfile = ref "" let rcfile_specified = ref false let set_rcfile s = rcfile := s; rcfile_specified := true @@ -32,11 +33,14 @@ let load_rcfile() = if file_readable_p !rcfile then Vernac.load_vernac false !rcfile else raise (Sys_error ("Cannot read rcfile: "^ !rcfile)) - else if file_readable_p (!rcfile^"."^Coq_config.version) then - Vernac.load_vernac false (!rcfile^"."^Coq_config.version) - else if file_readable_p !rcfile then - Vernac.load_vernac false !rcfile - else () + else try let inferedrc = List.find file_readable_p [ + Envars.xdg_config_home/rcdefaultname^"."^Coq_config.version; + Envars.xdg_config_home/rcdefaultname; + System.home/"."^rcdefaultname^"."^Coq_config.version; + System.home/"."^rcdefaultname; + ] in + Vernac.load_vernac false inferedrc + with Not_found -> () (* Flags.if_verbose mSGNL (str ("No coqrc or coqrc."^Coq_config.version^ |