bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more patches from Sir Raorn

Browse Source
This commit is contained in:
Jacobo Tarrío 2000-09-01 16:23:15 +00:00
parent 2fa38e497b
commit b6e2ea1384
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
golded3/geedit.cpp
View File

@ -1780,7 +1780,8 @@ void IEclass::Reflow() {
const char* _qlenptr = currline->txt.c_str() + _qlen1; const char* _qlenptr = currline->txt.c_str() + _qlen1;
// Strip leading spaces from the first line // Strip leading spaces from the first line
const char* ptr = strskip_wht(_qlenptr); const char* ptr = _qlenptr;
while(*ptr and isspace(*ptr) and *ptr != '\n') ptr++;
if(ptr != _qlenptr) { if(ptr != _qlenptr) {
Undo->PushItem(EDIT_UNDO_DEL_TEXT, currline, _qlen1, ptr-_qlenptr); Undo->PushItem(EDIT_UNDO_DEL_TEXT, currline, _qlen1, ptr-_qlenptr);
currline->txt.erase(_qlen1, ptr-_qlenptr); currline->txt.erase(_qlen1, ptr-_qlenptr);

7
golded3/geedit2.cpp
View File

@ -858,6 +858,8 @@ inline char uuencode_enc(int c) { return (char)(c ? (c & 077) + ' ': '`'); }
void IEclass::editimport(Line* __line, char* __filename, bool imptxt) { void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
XlatName __oldxlatimport;
GFTRK("Editimport"); GFTRK("Editimport");
// Save the unfinished msg first of all // Save the unfinished msg first of all
@ -874,6 +876,9 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
AA->SetInputfile("*"); AA->SetInputfile("*");
} }
strcpy(__oldxlatimport, AA->Xlatimport());
AA->SetXlatimport(CFG->xlatlocalset);
strcpy(CFG->inputfile, AA->Inputfile()); strcpy(CFG->inputfile, AA->Inputfile());
int ImportMode; int ImportMode;
@ -1157,6 +1162,8 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
} }
} }
AA->SetXlatimport(__oldxlatimport);
GFTRK(NULL); GFTRK(NULL);
} }

2
golded3/geline.cpp
View File

@ -1784,8 +1784,6 @@ static int cmp_quotes(char* q1, char* q2) {
do { do {
q1 = spanspaces(++q1); q1 = spanspaces(++q1);
q2 = spanspaces(++q2); q2 = spanspaces(++q2);
if(*q2 == 0)
return YES;
if(*q1 != *q2) if(*q1 != *q2)
return NO; return NO;
} while(*q1 and *q2); } while(*q1 and *q2);

8
goldlib/gall/gkbdbase.cpp
View File

@ -991,6 +991,12 @@ gkey kbxget_raw(int mode) {
k = 0x8100; k = 0x8100;
else if(isalpha(key2)) else if(isalpha(key2))
k = (scancode_table[key2]); k = (scancode_table[key2]);
else if(key2 == '\010')
k = Key_A_BS;
else if(key2 == '\011')
k = Key_A_Tab;
else if(key2 == '\015')
k = Key_A_Ent;
else { else {
// No correct Alt-sequence; ungetch last key and return Esc // No correct Alt-sequence; ungetch last key and return Esc
if (mode != 1) if (mode != 1)
@ -1305,6 +1311,8 @@ gkey kbxget_raw(int mode) {
shifts = 0; shifts = 0;
if(shifts & ALT) if(shifts & ALT)
k = Key_A_BS; k = Key_A_BS;
else if(shifts & GCTRL)
k = Key_C_BS;
} }
#endif #endif

13
goldlib/gcfg/gxcrash.cpp
View File

@ -151,14 +151,19 @@ void gareafile::ReadCrashmail(char* tag) {
AddNewArea(aa); AddNewArea(aa);
aa.reset(); aa.reset();
} }
aa.type = (crc16 == CRC_NETMAIL) ? GMB_NET : (crc16 == CRC_LOCALAREA) ? GMB_LOCAL : GMB_ECHO; switch(crc16) {
switch(aa.type) { case CRC_NETMAIL:
case GMB_NET: aa.type = GMB_NET;
aa.attr = attribsnet; aa.attr = attribsnet;
break; break;
case GMB_ECHO: case CRC_AREA:
aa.type = GMB_ECHO;
aa.attr = attribsecho; aa.attr = attribsecho;
break; break;
case CRC_LOCALAREA:
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
break;
} }
unconfirmed = false; unconfirmed = false;
jbstrcpy(tmp, buf, 100, &jbcpos); jbstrcpy(tmp, buf, 100, &jbcpos);