summaryrefslogtreecommitdiff
path: root/lib/repl.js
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-11-18 13:41:17 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-11-18 13:41:17 -0800
commit2329a254b480a5a0bbe13079dd4bed6b38dfc126 (patch)
tree13a6f3379c7a5413320e15565d570a23cc0b2ae0 /lib/repl.js
parentbd9c66668c6fe45d640bce208da61bd1c864e104 (diff)
parent1394d5856b4c7b7ade1f1accbd9bffeea2e2144d (diff)
downloadnodejs-2329a254b480a5a0bbe13079dd4bed6b38dfc126.tar.gz
nodejs-2329a254b480a5a0bbe13079dd4bed6b38dfc126.tar.bz2
nodejs-2329a254b480a5a0bbe13079dd4bed6b38dfc126.zip
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/README.md deps/uv/build.mk deps/uv/src/unix/core.c deps/uv/src/unix/darwin-proctitle.c deps/uv/src/unix/darwin.c deps/uv/src/unix/fsevents.c deps/uv/src/unix/udp.c deps/uv/src/version.c deps/v8/src/platform-solaris.cc deps/v8/test/cctest/test-api.cc lib/tls.js src/node.h src/node_version.h
Diffstat (limited to 'lib/repl.js')
-rw-r--r--lib/repl.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/repl.js b/lib/repl.js
index 151d6cafa..8a2395527 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -669,7 +669,7 @@ REPLServer.prototype.complete = function(line, callback) {
group.sort();
for (var j = 0; j < group.length; j++) {
c = group[j];
- if (!hasOwnProperty(c)) {
+ if (!hasOwnProperty(uniq, c)) {
completions.push(c);
uniq[c] = true;
}