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

ZapQuotesBelow reverted back to old functionality

Browse Source
This commit is contained in:
Alexander S. Aganichev 2001-07-03 04:56:32 +00:00
parent d9891a8e6e
commit 97aa69048a
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/notework.txt
View File

@ -12,6 +12,8 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
! Reverted back to old behaviour of ZapQuotesBelow.
- Fixed EDITHEADERFIRST operation. - Fixed EDITHEADERFIRST operation.
+ Added new keyword AreaListGroupOrder to specify groups sorting order + Added new keyword AreaListGroupOrder to specify groups sorting order

36
golded3/geedit.cpp
View File

@ -1521,39 +1521,20 @@ void IEclass::deleteline(bool zapquotesbelow) {
GFTRK("Editdeleteline"); GFTRK("Editdeleteline");
if(zapquotesbelow and not (currline->type & GLINE_QUOT)) {
GFTRK(NULL);
return;
}
// Stop reflow if the quotestring on the next line is not the same
uint _qlen1;
char _qstr1[MAXQUOTELEN];
GetQuotestr(currline->txt.c_str(), _qstr1, &_qlen1);
bool done = false; bool done = false;
do { do {
// Break if need to zap quotes, but the current line is not quote and is not empty // Break if need to zap quotes, but the current line is not quote and is not empty
if(zapquotesbelow) { if(zapquotesbelow and not ((currline->type & GLINE_QUOT) or isempty(currline)))
if(isempty(currline) or (currline->type & (GLINE_KLUDGE|GLINE_TEAR|GLINE_ORIG|GLINE_TAGL))) break;
break;
// Stop zap if the quotestring on the line is not the same
uint _qlen2;
char _qstr2[MAXQUOTELEN];
GetQuotestr(currline->txt.c_str(), _qstr2, &_qlen2);
if(not cmp_quotes(_qstr1, _qstr2))
break;
}
// Pointer to the deleted line // Pointer to the deleted line
Line* _deletedline = currline; Line* _deletedline = currline;
// If last line to be deleted delete to EOL and exit // If last line to be deleted delete to EOL and exit
if(currline->next == NULL) { if(currline->next == NULL) {
if(currline->txt.empty()) if(isempty(currline))
break; break;
insertlinebelow(currline, "", batch_mode); insertlinebelow(currline, "", batch_mode);
batch_mode = BATCH_MODE; batch_mode = BATCH_MODE;
@ -1678,16 +1659,11 @@ void IEclass::ZapQuoteBelow() {
else else
Undo->PushItem(EDIT_UNDO_VOID|batch_mode, currline); Undo->PushItem(EDIT_UNDO_VOID|batch_mode, currline);
batch_mode = BATCH_MODE; batch_mode = BATCH_MODE;
UndoItem* item_to_fix = Undo->last_item;
deleteline(true); deleteline(true);
if(row) { if(row == 0) {
GoUp(); item_to_fix->line = currline;
GoEOL();
}
else {
UndoItem* i = Undo->last_item;
do { i = i->prev; } while(i->action & BATCH_MODE);
i->line = currline;
} }
GFTRK(NULL); GFTRK(NULL);