add Pkg.dir to LOAD_PATH (to keep Documenter working)

JuliaLang · Dec 31, 2017 · d22587c · d22587c
1 parent 393b19c
commit d22587c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/base/initdefs.jl b/base/initdefs.jl
@@ -117,6 +117,7 @@ function init_load_path(BINDIR = Sys.BINDIR)
     load_path = get(ENV, "JULIA_LOAD_PATH", "@|@v#.#.#|@v#.#|@v#|@default|@!v#.#")
     append!(empty!(LOAD_PATH), parse_load_path(load_path))
     vers = "v$(VERSION.major).$(VERSION.minor)"
+    push!(LOAD_PATH, Pkg.dir)
     push!(LOAD_PATH, abspath(BINDIR, "..", "local", "share", "julia", "site", vers))
     push!(LOAD_PATH, abspath(BINDIR, "..", "share", "julia", "site", vers))
 end

diff --git a/base/loading.jl b/base/loading.jl
@@ -199,6 +199,8 @@ function find_env(env::CurrentEnv, dir::AbstractString = pwd())
     end
 end
 
+find_env(env::Function) = find_env(env())
+
 load_path() = filter(env -> env != nothing, map(find_env, LOAD_PATH))
 
 package_entry_points(path::AbstractString, name::AbstractString) = [
-Original file line number
+Diff line change
@@ Expand Up @@
         end
     end
+    find_env(env::Function) = find_env(env())
     load_path() = filter(env -> env != nothing, map(find_env, LOAD_PATH))
     package_entry_points(path::AbstractString, name::AbstractString) = [
@@ Expand Down @@