1999-03-15 01:45:43 +00:00
|
|
|
|
--- pine/reply.c.orig Thu Jan 28 06:32:10 1999
|
|
|
|
|
+++ pine/reply.c Tue Feb 23 15:55:36 1999
|
|
|
|
|
@@ -107,9 +107,9 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
/*
|
|
|
|
|
* Little defs to keep the code a bit neater...
|
|
|
|
|
*/
|
|
|
|
|
-#define FRM_PMT "Use \"Reply-To:\" address instead of \"From:\" address"
|
|
|
|
|
-#define ALL_PMT "Reply to all recipients"
|
|
|
|
|
-#define NEWS_PMT "Follow-up to news group(s), Reply via email to author or Both? "
|
|
|
|
|
+#define FRM_PMT "<22>ϥ<EFBFBD> \"Reply-To:\" <20>a<EFBFBD>}<7D>N<EFBFBD><4E> \"From:\" <20>a<EFBFBD>}"
|
|
|
|
|
+#define ALL_PMT "<22>^<5E>е<EFBFBD><D0B5>Ҧ<EFBFBD><D2A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>"
|
|
|
|
|
+#define NEWS_PMT "<22>^<5E>Цܷs<DCB7>D<EFBFBD>ոs<D5B8>A<EFBFBD>^<5E>絹<EFBFBD>@<40>̩Ψ<CCA9><CEA8>̬ҭn<D2AD>H"
|
1999-03-15 01:45:43 +00:00
|
|
|
|
#define SIGDASHES "-- "
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
1999-03-15 01:45:43 +00:00
|
|
|
|
|
|
|
|
|
@@ -293,7 +293,7 @@
|
|
|
|
|
else{ /* cancel reply */
|
|
|
|
|
role = NULL;
|
|
|
|
|
close_patterns(&pattern_h);
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
|
|
|
|
goto done_early;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -558,7 +558,7 @@
|
1998-07-30 12:30:41 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
/* partially formatted outgoing message */
|
|
|
|
|
- pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
|
|
|
|
|
+ pine_send(outgoing, &body, "<22>s<EFBFBD><73><EFBFBD>H<EFBFBD><48><EFBFBD>^<5E><>",
|
1999-03-15 01:45:43 +00:00
|
|
|
|
role, fcc.tptr, &reply, redraft_pos, NULL, NULL, 0);
|
1998-08-09 00:51:28 +00:00
|
|
|
|
done:
|
1998-07-30 12:30:41 +00:00
|
|
|
|
pine_free_body(&body);
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -636,7 +636,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
(ADDRESS *) NULL, env->from, 0);
|
1998-07-30 12:30:41 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(ret == 'x') {
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
1998-07-30 12:30:41 +00:00
|
|
|
|
return(0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -685,7 +685,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|| (*saved_cc || *saved_resent))){
|
|
|
|
|
*flags &= ~RSF_QUERY_REPLY_ALL;
|
|
|
|
|
if((ret=want_to(ALL_PMT,'n','x',NO_HELP,WT_SEQ_SENSITIVE)) == 'x'){
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
|
|
|
|
return(0);
|
1998-07-30 12:30:41 +00:00
|
|
|
|
}
|
1998-08-09 00:51:28 +00:00
|
|
|
|
else if(ret == 'y')
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -1406,8 +1406,8 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
{
|
|
|
|
|
int ret, edited = 0;
|
|
|
|
|
static ESCKEY_S rtq_opts[] = {
|
|
|
|
|
- {'y', 'y', "Y", "Yes"},
|
|
|
|
|
- {'n', 'n', "N", "No"},
|
|
|
|
|
+ {'y', 'y', "Y", "<22>O"},
|
|
|
|
|
+ {'n', 'n', "N", "<22>_"},
|
|
|
|
|
{-1, 0, NULL, NULL}, /* may be overridden below */
|
|
|
|
|
{-1, 0, NULL, NULL}
|
|
|
|
|
};
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -1417,19 +1417,18 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
return(1);
|
|
|
|
|
|
|
|
|
|
while(1){
|
|
|
|
|
- sprintf(tmp_20k_buf, "Include %s%soriginal message%s in Reply%s%s%s? ",
|
|
|
|
|
- (many > 1L) ? comatose(many) : "",
|
|
|
|
|
- (many > 1L) ? " " : "",
|
|
|
|
|
- (many > 1L) ? "s" : "",
|
|
|
|
|
- F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? " (using \"" : "",
|
|
|
|
|
+ sprintf(tmp_20k_buf, "<22>b<EFBFBD>^<5E><>%s%s%s<><73><EFBFBD>]<5D>t%s%s<>쥻<EFBFBD><ECA5BB><EFBFBD>T<EFBFBD><54><EFBFBD>H",
|
|
|
|
|
+ F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "<22>]<5D>ϥ<EFBFBD> \"" : "",
|
|
|
|
|
F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? *prefix : "",
|
|
|
|
|
- F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\")" : "");
|
|
|
|
|
+ F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps) ? "\" <20><><EFBFBD>ި<EFBFBD><DEA8>ХܥN<DCA5><4E><EFBFBD>^" : "",
|
|
|
|
|
+ (many > 1L) ? comatose(many) : "",
|
|
|
|
|
+ (many > 1L) ? " " : "");
|
|
|
|
|
|
|
|
|
|
if(F_ON(F_ENABLE_EDIT_REPLY_INDENT, ps)){
|
|
|
|
|
rtq_opts[2].ch = ctrl('R');
|
|
|
|
|
rtq_opts[2].rval = 'r';
|
|
|
|
|
rtq_opts[2].name = "^R";
|
|
|
|
|
- rtq_opts[2].label = "Edit Indent String";
|
|
|
|
|
+ rtq_opts[2].label = "<22>s<EFBFBD><73><EFBFBD>ި<EFBFBD><DEA8>ХܥN<DCA5><4E>";
|
1998-07-30 12:30:41 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
1998-08-09 00:51:28 +00:00
|
|
|
|
rtq_opts[2].ch = -1;
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -1440,7 +1439,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
rtq_opts, edited ? 'y' : 'n',
|
|
|
|
|
'x', NO_HELP, RB_SEQ_SENSITIVE)){
|
|
|
|
|
case 'x':
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
|
|
|
|
return(-1);
|
|
|
|
|
|
|
|
|
|
case 'r':
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -1459,7 +1458,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
switch(optionally_enter(buf, ps->ttyo->screen_rows > 4
|
|
|
|
|
? -FOOTER_ROWS(ps_global) : -1,
|
|
|
|
|
- 0, 63, "Reply prefix : ",
|
|
|
|
|
+ 0, 63, "<22>ި<EFBFBD><DEA8>ХܥN<DCA5><4E><EFBFBD>G",
|
|
|
|
|
NULL, NO_HELP, &flags)){
|
|
|
|
|
case 0: /* entry successful, continue */
|
|
|
|
|
if(flags & OE_USER_MODIFIED){
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -1472,7 +1471,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
|
|
|
|
|
|
|
|
|
case -1:
|
|
|
|
|
return(-1);
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -2476,9 +2475,9 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
ENVELOPE *env, *outgoing;
|
|
|
|
|
{
|
|
|
|
|
int ret = 1;
|
|
|
|
|
- static ESCKEY_S news_opt[] = { {'f', 'f', "F", "Follow-up"},
|
|
|
|
|
- {'r', 'r', "R", "Reply"},
|
|
|
|
|
- {'b', 'b', "B", "Both"},
|
|
|
|
|
+ static ESCKEY_S news_opt[] = { {'f', 'f', "F", "<22>^<5E>Цܪ<D0A6><DCAA>W"},
|
|
|
|
|
+ {'r', 'r', "R", "<22>^<5E><><EFBFBD>@<40><>"},
|
|
|
|
|
+ {'b', 'b', "B", "<22><><EFBFBD>̬ҭn"},
|
|
|
|
|
{-1, 0, NULL, NULL} };
|
|
|
|
|
|
|
|
|
|
if(env->newsgroups && *env->newsgroups && !reply_poster_followup(env))
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -2502,7 +2501,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
case 'x' : /* cancel or unknown response */
|
|
|
|
|
default :
|
|
|
|
|
- cmd_cancelled("Reply");
|
|
|
|
|
+ cmd_cancelled("<22>^<5E><>");
|
|
|
|
|
ret = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -2510,7 +2509,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(ret > 1){
|
|
|
|
|
if(env->followup_to){
|
|
|
|
|
q_status_message(SM_ORDER, 2, 3,
|
|
|
|
|
- "Posting to specified Followup-To groups");
|
|
|
|
|
+ "<22>Z<EFBFBD>n<EFBFBD>ܯS<DCAF>w<EFBFBD><77><EFBFBD>^<5E>вոs");
|
|
|
|
|
outgoing->newsgroups = cpystr(env->followup_to);
|
1998-07-30 12:30:41 +00:00
|
|
|
|
}
|
1998-08-09 00:51:28 +00:00
|
|
|
|
else if(!outgoing->newsgroups)
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -3148,7 +3147,7 @@
|
|
|
|
|
: 0;
|
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(ret == 'x'){
|
1999-03-15 01:45:43 +00:00
|
|
|
|
- cmd_cancelled("Forward");
|
|
|
|
|
+ cmd_cancelled("<22><><EFBFBD>H");
|
|
|
|
|
so_give((STORE_S **)&msgtext);
|
|
|
|
|
goto clean;
|
1998-07-30 12:30:41 +00:00
|
|
|
|
}
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -3163,7 +3162,7 @@
|
|
|
|
|
else{ /* cancel reply */
|
|
|
|
|
role = NULL;
|
|
|
|
|
close_patterns(&pattern_h);
|
|
|
|
|
- cmd_cancelled("Forward");
|
|
|
|
|
+ cmd_cancelled("<22><><EFBFBD>H");
|
|
|
|
|
so_give((STORE_S **)&msgtext);
|
|
|
|
|
goto clean;
|
|
|
|
|
}
|
|
|
|
|
@@ -3360,7 +3359,7 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
|
|
|
|
|
else /* partially formatted outgoing message */
|
|
|
|
|
pine_send(outgoing, &body,
|
|
|
|
|
- ps->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
|
|
|
|
|
+ ps->nr_mode ? "<22>e<EFBFBD>X<EFBFBD>H<EFBFBD><48>" : "<22><><EFBFBD>H<EFBFBD>H<EFBFBD><48>",
|
1999-03-15 01:45:43 +00:00
|
|
|
|
role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
clean:
|
1999-03-15 01:45:43 +00:00
|
|
|
|
@@ -3383,7 +3382,7 @@
|
|
|
|
|
mail_gc(ps->mail_stream, GC_TEXTS);
|
|
|
|
|
#endif
|
|
|
|
|
q_status_message(SM_ORDER | SM_DING, 4, 5,
|
|
|
|
|
- "Error fetching message contents. Can't forward message.");
|
|
|
|
|
+ "<22>^<5E><><EFBFBD>H<EFBFBD>e<F3A4BAAE>ɵo<C9B5>Ϳ<EFBFBD><CDBF>~<7E>C<EFBFBD>L<EFBFBD>k<EFBFBD><6B><EFBFBD>H<EFBFBD>H<EFBFBD><48><EFBFBD>C");
|
|
|
|
|
goto clean;
|
|
|
|
|
}
|
|
|
|
|
|