Temporarily disabled the AreaRecycleBin

cfgs/config/advanced.cfg

@@ -432,9 +432,6 @@ AREAREPLYTO E-MAIL
 //              <echoid>
 ;AREAYOUWROTETO MY_MAILS
 
-// AreaRecycleBin <area>
-// If enabled, GoldEd will move deleted messages to <area>.
-;AreaRecycleBin RECYCLE.BIN
 
 ----------------------------------------------------------------------
 -- STATUSLINE

cfgs/config/advanced.rus

@@ -433,10 +433,6 @@ AreaCopyTo ZZZ.MY.ARCHIVE
 // ‚ £à㯯 å íâ®â ¯ à ¬¥âà à ¡®â ¥â á ¢¥àᨨ 3.00.a5.
 AreaCopyAddId No
 
-// AreaRecycleBin <area>
-// “áâ ­®˘Ş  ®ˇ« áâ¨, Şă¤  GoldEd ŻĄŕĄ¬Ąáâ¨â Ż¨á쬠 Żŕ¨ 㤠«Ą­¨¨.
-;AreaRecycleBin RECYCLE.BIN
-
 
 ----------------------------------------------------------------------
 -- ‘’<E28098>ŽŠ€ ‘Ž‘’ŽŸ<C5BD>ˆŸ

docs/notework.txt

@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+! Temporarily disabled the AreaRecycleBin.
+
 ! Rename macroses:
   @echopath to @areapath - path to echoarea base,
   @echoname to @areaname - echoarea file name without path,

golded3/gccfgg0.cpp

@@ -218,7 +218,9 @@ SwitchA:
     case CRC_AREAPMSCANEXCL   :  CfgAreapmscanexcl   ();  break;
     case CRC_AREAPMSCANINCL   :  CfgAreapmscanincl   ();  break;
     case CRC_AREAREADONLY     :  CfgAreareadonly     ();  break;
+#if defined(__INCLUDE_NEW_KEYWORDS__)
     case CRC_AREARECYCLEBIN   :  CfgArearecyclebin   ();  break;
+#endif
     case CRC_AREARENAME       :  CfgArearename       ();  break;
     case CRC_AREAREPLYDIRECT  :  CfgAreareplydirect  ();  break;
     case CRC_AREAREPLYTO      :  CfgAreareplyto      ();  break;

golded3/gecmfd.cpp

@@ -149,13 +149,16 @@ void Area::DelMsgs(GMsg* msg) {
 
   GFTRK("DelMsgs");
 
-  int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
-  int currno = AL.AreaIdToNo(CurrArea);
-  if ((areano != currno) && (areano >= 0))
+  if (CFG->arearecyclebin[0])
   {
-    CopyMoveForward(true);
-    GFTRK(NULL);
-    return;
+    int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
+    int currno = AL.AreaIdToNo(CurrArea);
+    if ((areano != currno) && (areano >= 0))
+    {
+      CopyMoveForward(true);
+      GFTRK(NULL);
+      return;
+    }
   }
 
   uint n, x;
@@ -420,7 +423,7 @@ void CmfMsgs(GMsg* msg, bool torecycle)
       destarea = AL.AreaNoToId(a);
   }
 
-  if (torecycle || (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect()))
+  if (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect())
     destarea = AreaPick(pickstr, 6, &destarea);
 
   if(destarea == -1) {