From 639701125b721dc1654696c8515b631907f65326 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Wed, 10 Oct 2012 06:41:02 -0400
Subject: [PATCH] Don't use arguments.callee

---
 lib/imap.js | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/imap.js b/lib/imap.js
index 2cf46eb..3c0ec7c 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -1037,47 +1037,44 @@ ImapConnection.prototype._move = function(which, uids, boxTo, cb) {
   var self = this;
   if (this._state.status !== STATES.BOXSELECTED)
     throw new Error('No mailbox is currently selected');
-  if (self._state.box.permFlags.indexOf('Deleted') === -1) {
+  if (this._state.box.permFlags.indexOf('Deleted') === -1) {
     throw new Error('Cannot move message: '
                     + 'server does not allow deletion of messages');
   } else {
-    self._copy(which, uids, boxTo, function(err, reentryCount, deletedUIDs,
-                                             counter) {
-      if (err) {
-        cb(err);
-        return;
-      }
+    this._copy(which, uids, boxTo, function ccb(err, reentryCount, deletedUIDs,
+                                                counter) {
+      if (err)
+        return cb(err);
 
-      var fnMe = arguments.callee;
       counter = counter || 0;
       // Make sure we don't expunge any messages marked as Deleted except the
       // one we are moving
       if (reentryCount === undefined) {
         self.search(['DELETED'], function(e, result) {
-          fnMe.call(this, e, 1, result);
+          ccb(e, 1, result);
         });
       } else if (reentryCount === 1) {
         if (counter < deletedUIDs.length) {
           self.delFlags(deletedUIDs[counter], 'Deleted', function(e) {
             process.nextTick(function() {
-              fnMe.call(this, e, reentryCount, deletedUIDs, counter + 1);
+              ccb(e, reentryCount, deletedUIDs, counter + 1);
             });
           });
         } else
-          fnMe.call(this, err, reentryCount + 1, deletedUIDs);
+          ccb(err, reentryCount + 1, deletedUIDs);
       } else if (reentryCount === 2) {
         self.addFlags(uids, 'Deleted', function(e) {
-          fnMe.call(this, e, reentryCount + 1, deletedUIDs);
+          ccb(e, reentryCount + 1, deletedUIDs);
         });
       } else if (reentryCount === 3) {
         self.removeDeleted(function(e) {
-          fnMe.call(this, e, reentryCount + 1, deletedUIDs);
+          ccb(e, reentryCount + 1, deletedUIDs);
         });
       } else if (reentryCount === 4) {
         if (counter < deletedUIDs.length) {
           self.addFlags(deletedUIDs[counter], 'Deleted', function(e) {
             process.nextTick(function() {
-              fnMe.call(this, e, reentryCount, deletedUIDs, counter + 1);
+              ccb(e, reentryCount, deletedUIDs, counter + 1);
             });
           });
         } else