Externutils/charset fixes
This commit is contained in:
parent
7f90a6d53d
commit
9d58bafa3e
@ -12,6 +12,11 @@ ______________________________________________________________________
|
||||
Notes for GoldED+ 1.1.5, /snapshot/
|
||||
______________________________________________________________________
|
||||
|
||||
- Fixed improper charset conversion when replying on message without
|
||||
charset between areas with different Xlatimport.
|
||||
|
||||
- Fixed externutils/external editor with freshly created messages.
|
||||
|
||||
- Fixed bug in Latin-x to ISO-8859-x converter, now charset in
|
||||
Internet mail should be properly specifyed as ISO rather than as
|
||||
Latin.
|
||||
|
@ -67,6 +67,7 @@ void SaveLines(int mode, const char* savefile, GMsg* msg, int margin, bool clip)
|
||||
}
|
||||
}
|
||||
#else
|
||||
if(mode == MODE_WRITE)
|
||||
AA->LoadMsg(msg, msg->msgno, margin); // reload message
|
||||
TemplateToText(((mode == MODE_WRITE) and prnheader) ? ((prnheader & WRITE_ONLY_HEADER) ? MODE_HEADER : MODE_WRITEHEADER) : MODE_WRITE, msg, msg, AA->WTpl(), CurrArea);
|
||||
msg->attr.tou1();
|
||||
|
@ -441,7 +441,7 @@ char* strxmimecpy(char* dest, const char* source, int level, int size, bool dete
|
||||
|
||||
if(detect) {
|
||||
if(table == -1)
|
||||
LoadCharset(CFG->xlatimport, CFG->xlatlocalset);
|
||||
LoadCharset(AA->Xlatimport(), CFG->xlatlocalset);
|
||||
else
|
||||
LoadCharset(CFG->xlatcharset[table].imp, CFG->xlatcharset[table].exp);
|
||||
}
|
||||
|
@ -558,6 +558,11 @@ static void MakeMsg2(int& mode, int& status, int& forwstat, int& topline, GMsg*
|
||||
status = MODE_QUIT;
|
||||
}
|
||||
}
|
||||
if(status != MODE_QUIT) {
|
||||
LoadCharset("N/A", "N/A");
|
||||
strcpy(stpcpy(msg->charset, CFG->xlatlocalset), " 2");
|
||||
msg->charsetlevel = 2;
|
||||
}
|
||||
}
|
||||
else if(forwstat == NO and (EDIT->Internal() or not *EDIT->External())) {
|
||||
w_info(LNG->Wait);
|
||||
@ -830,6 +835,8 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
|
||||
switch(mode) {
|
||||
case MODE_QUOTE:
|
||||
case MODE_REPLYCOMMENT:
|
||||
if(CurrArea != OrigArea)
|
||||
AA->SetXlatimport(AL.AreaIdToPtr(OrigArea)->Xlatimport());
|
||||
omsg->attr.tou0();
|
||||
omsg->TextToLines(-CFG->quotemargin, false);
|
||||
if(ignore_replyto)
|
||||
|
Reference in New Issue
Block a user