Permalink
Browse files

Finish removing require.paths

Fix require() completion bug in repl, and correct man output
  • Loading branch information...
1 parent db99395 commit c050d0fa19a2dbb34e1e99403b597a5e8e51b6e5 @isaacs isaacs committed Jul 25, 2011
Showing with 5 additions and 6 deletions.
  1. +1 −2 doc/node.1
  2. +3 −2 lib/repl.js
  3. +1 −2 src/node.cc
View
@@ -44,8 +44,7 @@ and servers.
.SH ENVIRONMENT VARIABLES
.IP NODE_PATH
-\':\'\-separated list of directories prefixed to the module search path,
-require.paths.
+\':\'\-separated list of directories prefixed to the module search path.
.IP NODE_MODULE_CONTEXTS
If set to 1 then modules will load in their own global contexts.
View
@@ -298,8 +298,9 @@ REPLServer.prototype.complete = function(line) {
var filter = match[1];
var dir, files, f, name, base, ext, abs, subfiles, s;
group = [];
- for (i = 0; i < require.paths.length; i++) {
- dir = path.resolve(require.paths[i], subdir);
+ var paths = module.paths.concat(require("module").globalPaths);
+ for (i = 0; i < paths.length; i++) {
+ dir = path.resolve(paths[i], subdir);
try {
files = fs.readdirSync(dir);
} catch (e) {
View
@@ -2259,8 +2259,7 @@ static void PrintHelp() {
"\n"
"Enviromental variables:\n"
"NODE_PATH ':'-separated list of directories\n"
- " prefixed to the module search path,\n"
- " require.paths.\n"
+ " prefixed to the module search path.\n"
"NODE_MODULE_CONTEXTS Set to 1 to load modules in their own\n"
" global contexts.\n"
"NODE_DISABLE_COLORS Set to 1 to disable colors in the REPL\n"

0 comments on commit c050d0f

Please sign in to comment.