mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
* src/text.C
(bool LyXText::Delete): move cursor to next par after deleting a paragraph break in change tracking mode. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13495 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
23b74fa112
commit
64aab4aa75
10
src/text.C
10
src/text.C
@ -1579,9 +1579,7 @@ bool LyXText::Delete(LCursor & cur)
|
||||
recordUndo(cur, Undo::DELETE, cur.pit());
|
||||
setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
|
||||
needsUpdate = backspace(cur);
|
||||
Paragraph & par = cur.paragraph();
|
||||
if (cur.pos() < par.size()
|
||||
&& par.lookupChange(cur.pos()) == Change::DELETED)
|
||||
if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
|
||||
cur.posRight();
|
||||
} else if (cur.pit() != cur.lastpit()) {
|
||||
LCursor scur = cur;
|
||||
@ -1590,6 +1588,12 @@ bool LyXText::Delete(LCursor & cur)
|
||||
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());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user