home *** CD-ROM | disk | FTP | other *** search
/ Amiga Format CD 2 / amigaformatcd02.iso / demos / cdgallery / aga2 / software / utilities / comms / metamail-2.3a / elm113diffs.lha / mailer.diff < prev    next >
Encoding:
Text File  |  1992-05-02  |  5.2 KB  |  139 lines
  1. *** Elm113/mailer.c    Sat Apr 18 17:06:10 1992
  2. --- new/mailer.c    Fri May 01 00:05:09 1992
  3. ***************
  4. *** 1,7 ****
  5. --- 1,13 ----
  6.   #include <signal.h>
  7.   #include "prefs.h"
  8. + #ifdef LATTICE
  9.   #include <proto/dos.h>
  10.   #include <proto/exec.h>
  11. + #endif
  12. + #ifdef DICE
  13. + #include <clib/exec_protos.h>
  14. + #include <clib/dos_protos.h>
  15. + #endif
  16.   
  17.   static char *version = "\0$VER: AmigaElm 1.13 (Sun, 18 Apr 1992 22:20:27 MET)";
  18.   
  19. ***************
  20. *** 55,60 ****
  21. --- 61,67 ----
  22.   BOOL UseOwnScreen    = TRUE;  /* open elm window on workbench or own screen */
  23.   BOOL ShanghaiWindows = TRUE;  /* shanghai mode (hijack windows) */
  24.   BOOL ReverseSorting  = TRUE;  /* reverse sort order: newest mail first, oldest last */
  25. + BOOL ElmToFrontAllowed = TRUE;/* pop Elm window to front and activate after command */
  26.   BOOL WBToFront       = FALSE; /* pop workbench to front for editor etc. */
  27.   BOOL UseCmdClearKludge=FALSE; /* use the "Henning Schmiedehausen CMD_CLEAR kludge" */
  28.   BOOL TopDownScrolling= FALSE; /* use slow (better looking) bottom-up scrolling */
  29. ***************
  30. *** 241,251 ****
  31.           if (RedisplayMenu) {
  32.             sprintf(TBuffer,"\033[%d;1H\033[J",Win_Height-5);
  33.             outline();
  34. !           putst_center("!=shell, |=pipe, +, -, <, >, ?=help, <n>=set current to n");
  35.             putch('\n');
  36.             putst_center("c)hange folder, C)opy, d)elete, e)dit, f)orward, g)roup reply, ^G)oto last msg,");
  37.             putch('\n');
  38.             putst_center("m)ail, o)ptions, p)rint, q)uit, r)eply, s)ave, u)ndelete, w)rite, or e(x)it");
  39.             RedisplayCmd=TRUE;
  40.           }
  41.   
  42. --- 248,266 ----
  43.           if (RedisplayMenu) {
  44.             sprintf(TBuffer,"\033[%d;1H\033[J",Win_Height-5);
  45.             outline();
  46. ! #ifndef NOMETAMAIL
  47. !           putst_center("!=shell, |=pipe, +, -, <, >, ?=help, <n>=set current to n, c)hange folder,");
  48.             putch('\n');
  49. +           putst_center("C)opy, d)elete, e)dit, f)orward, g)roup reply, ^G)oto last msg, m)ail,");
  50. +           putch('\n');
  51. +           putst_center("M)ailto, o)ptions, p)rint, q)uit, r)eply, s)ave, u)ndelete, w)rite, e(x)it");
  52. + #else
  53. +           putst_center("!=shell, |=pipe, +, -, <, >, ?=help, <n>=set current to n");
  54. +           putch('\n');
  55.             putst_center("c)hange folder, C)opy, d)elete, e)dit, f)orward, g)roup reply, ^G)oto last msg,");
  56.             putch('\n');
  57.             putst_center("m)ail, o)ptions, p)rint, q)uit, r)eply, s)ave, u)ndelete, w)rite, or e(x)it");
  58. + #endif
  59.             RedisplayCmd=TRUE;
  60.           }
  61.   
  62. ***************
  63. *** 278,283 ****
  64. --- 293,299 ----
  65.   
  66.               i=c;
  67.               switch (i) {
  68. + #if 0
  69.   /*
  70.                   case 0x9b:
  71.                       c=getch();
  72. ***************
  73. *** 305,310 ****
  74. --- 321,327 ----
  75.                       Escape=TRUE;
  76.                       break;
  77.   */
  78. + #endif
  79.                   case '\016':
  80.                   case '+':
  81.                   case 'j':
  82. ***************
  83. *** 387,393 ****
  84.                   case '/':
  85.                       putst("Extra Shell");
  86.                       if (Shell)
  87. !                       Execute(Shell,NULL,NULL);
  88.                       else
  89.                         status_msg("shell is undefined",100L);
  90.                       Action=TRUE;
  91. --- 404,410 ----
  92.                   case '/':
  93.                       putst("Extra Shell");
  94.                       if (Shell)
  95. !                       Execute(Shell,(BPTR)NULL,(BPTR)NULL);
  96.                       else
  97.                         status_msg("shell is undefined",100L);
  98.                       Action=TRUE;
  99. ***************
  100. *** 534,539 ****
  101. --- 551,559 ----
  102.                       putst(" $ : resynchronize folder            ? : this page of information\n");
  103.                       putst(" m : send off new message            b : bounce (remail) message\n");
  104.                       putst(" r : reply to message                g : group reply\n");
  105. + #ifndef NOMETAMAIL
  106. +                     putst(" Mr: reply to message with mailto    Mg: group reply to message with mailto\n");
  107. + #endif
  108.                       putst(" f : forward message                ^g : goto last message\n");
  109.                       putst(" w : write text to file (no header)  s : save message to file (incl. header)\n");
  110.                       putst(" C : copy to other user's folder     E : export message (archive)\n");
  111. ***************
  112. *** 610,615 ****
  113. --- 630,654 ----
  114.                       Action=TRUE;
  115.                       RedisplayCmd=TRUE;
  116.                       break;
  117. + #ifndef NOMETAMAIL
  118. +                 case 'M':
  119. +                     {
  120. +                       int answer;
  121. +                       putst("mailto \033[3m [g)roup r)eply] \033[0m");
  122. +                       answer=getch();
  123. +                       if (answer=='g' || answer=='G') {
  124. +                         putst("Group.");
  125. +                         replyMIMEmail(Aktuell,TRUE);
  126. +                       } else if (answer=='r' || answer=='R') {
  127. +                         putst("Reply.");
  128. +                         replyMIMEmail(Aktuell,FALSE);
  129. +                       }
  130. +                     }
  131. +                     RedisplayCurrent=TRUE;
  132. +                     RedisplayCmd=TRUE;
  133. +                     Action=TRUE;
  134. +                     break;
  135. + #endif
  136.                   case 'n':
  137.                       I->Status &= (~READ);
  138.                       Action=TRUE;
  139.