summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/api.txt12
-rw-r--r--src/node.js5
2 files changed, 5 insertions, 12 deletions
diff --git a/doc/api.txt b/doc/api.txt
index b4e35ab9b..516396888 100644
--- a/doc/api.txt
+++ b/doc/api.txt
@@ -158,18 +158,6 @@ information.
Similar to +eval()+ except that you can specify a +scriptOrigin+ for better
error reporting and the +code+ cannot see the local scope.
-+process.mixin([deep], target, object1, [objectN])+ ::
-Extend one object with one or more others, returning the modified object.
-If no target is specified, the +GLOBAL+ namespace itself is extended.
-Keep in mind that the target object will be modified, and will be returned
-from +process.mixin()+.
-+
-If a boolean true is specified as the first argument, Node performs a deep
-copy, recursively copying any objects it finds. Otherwise, the copy will
-share structure with the original object(s).
-+
-Undefined properties are not copied. However, properties inherited from the
-object's prototype will be copied over.
== System module
diff --git a/src/node.js b/src/node.js
index f55ad3c54..aea3d1bfe 100644
--- a/src/node.js
+++ b/src/node.js
@@ -100,7 +100,12 @@ process.assert = function (x, msg) {
// Dual licensed under the MIT and GPL licenses.
// http://docs.jquery.com/License
// Modified for node.js (formely for copying properties correctly)
+var mixinMessage;
process.mixin = function() {
+ if (!mixinMessage) {
+ mixinMessage = 'deprecation warning: process.mixin will be removed from node-core future releases.\n'
+ process.stdio.writeError(mixinMessage);
+ }
// copy reference to target object
var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, source;