anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert accidental commit

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13871 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-05-19 07:47:53 +00:00
parent 40f7759976
commit 7cf67738d7
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/text.C
View File

@ -1573,26 +1573,31 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action)
bool LyXText::Delete(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
bool needsUpdate = false;
if (cur.pos() != cur.lastpos()) {
// move right, avoiding dEPM
recordUndo(cur, Undo::DELETE, cur.pit());
setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
needsUpdate = backspace(cur);
if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
cur.posRight();
} else if (cur.pit() != cur.lastpit()) {
// move to next paragraph, avoiding dEPM
LCursor scur = cur;
setCursorIntern(cur, cur.pit() + 1, 0, false, false);
} else {
// nothing to do
return false;
if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
recordUndo(scur, Undo::DELETE, scur.pit());
needsUpdate = backspace(cur);
if (cur.buffer().params().tracking_changes) {
// move forward after the paragraph break is DELETED
Paragraph & par = cur.paragraph();
if (par.lookupChange(par.size()) == Change::DELETED)
setCursorIntern(cur, cur.pit() + 1, 0);
}
} else {
setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
}
}
// Delegate the real work to backspace.
bool needsUpdate = backspace(cur);
// if in CT mode, go one step to the right
if (cur.buffer().params().tracking_changes &&
cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
cur.posRight();
return needsUpdate;
}
@ -1608,7 +1613,7 @@ bool LyXText::backspacePos0(LCursor & cur)
if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) {
// This is an empty paragraph and we delete it just
// by moving the cursor one step
// left and let the deleteEmptyParagraphMechanism
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
if (cur.pit() != 0) {