From c73cd5349ef532e8ac323a05c98fab7cb5c12fa5 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Tue, 15 May 2018 10:03:06 +0200
Subject: documentation generator works again

---
 compiler/main.nim    | 16 ++++++++--------
 compiler/nimconf.nim |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'compiler')

diff --git a/compiler/main.nim b/compiler/main.nim
index 69b33653b..e3f00db9e 100644
--- a/compiler/main.nim
+++ b/compiler/main.nim
@@ -188,43 +188,43 @@ proc mainCommand*(graph: ModuleGraph; cache: IdentCache) =
   of "doc0":
     wantMainModule(conf)
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     commandDoc(conf)
   of "doc2", "doc":
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     defineSymbol(conf.symbols, "nimdoc")
     commandDoc2(graph, cache, false)
   of "rst2html":
     conf.cmd = cmdRst2html
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     commandRst2Html(conf)
   of "rst2tex":
     conf.cmd = cmdRst2tex
-    loadConfigs(DocTexConfig, cache)
+    loadConfigs(DocTexConfig, cache, conf)
     commandRst2TeX(conf)
   of "jsondoc0":
     wantMainModule(conf)
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     wantMainModule(conf)
     defineSymbol(conf.symbols, "nimdoc")
     commandJson(conf)
   of "jsondoc2", "jsondoc":
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     wantMainModule(conf)
     defineSymbol(conf.symbols, "nimdoc")
     commandDoc2(graph, cache, true)
   of "ctags":
     wantMainModule(conf)
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     defineSymbol(conf.symbols, "nimdoc")
     commandTags(conf)
   of "buildindex":
     conf.cmd = cmdDoc
-    loadConfigs(DocConfig, cache)
+    loadConfigs(DocConfig, cache, conf)
     commandBuildIndex(conf)
   of "gendepend":
     conf.cmd = cmdGenDepend
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index 379d15ad6..6cb5bab0f 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -230,7 +230,7 @@ proc getSystemConfigPath(conf: ConfigRef; filename: string): string =
     if not existsFile(result): result = joinPath([p, "etc", filename])
     if not existsFile(result): result = "/etc/" & filename
 
-proc loadConfigs*(cfg: string; cache: IdentCache; conf: ConfigRef = nil) =
+proc loadConfigs*(cfg: string; cache: IdentCache; conf: ConfigRef) =
   setDefaultLibpath(conf)
 
   if optSkipConfigFile notin conf.globalOptions:
-- 
cgit 1.4.1-2-gfad0