diff --git a/docs/notework.txt b/docs/notework.txt index 3191d79..e035bf0 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -12,6 +12,8 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ +- Fixed invalid charset kludge in crossposted messages. + - Fixed handling of 0xe1 character in CP437 (require liblocal 0.2 under DJGPP). (not tested, please report any problem you have with it) diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp index 3bf3712..5492025 100644 --- a/golded3/gepost.cpp +++ b/golded3/gepost.cpp @@ -736,8 +736,10 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) { msg->TextToLines(CFG->dispmargin-1); msg->orig = AA->Aka().addr; msg->charsetlevel = LoadCharset(CFG->xlatlocalset, AA->Xlatexport()); - if(msg->charsetlevel!=0 and CharTable and not strblank(CharTable->exp)) - strcpy(msg->charset, CharTable->exp); + if(msg->charsetlevel) + sprintf(msg->charset, "%s %d", AA->Xlatexport(), msg->charsetlevel); + else + sprintf(msg->charset, "%s 2", CFG->xlatlocalset); strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &AA->Aka().addr)].domain); if(AA->isecho() or have_origin(msg)) DoTearorig(mode, msg);