anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

Browse Source
This commit is contained in:
Uwe Stöhr 2013-04-29 00:20:49 +02:00
commit d37f64962b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Text.cpp
View File

@ -1590,11 +1590,13 @@ bool Text::backspace(Cursor & cur)
if (cur.pit() == 0)
return dissolveInset(cur);
Paragraph & prev_par = pars_[cur.pit() - 1];
Cursor prev_cur = cur;
--prev_cur.pit();
if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
prev_par.setChange(prev_par.size(), Change(Change::DELETED));
setCursorIntern(cur, cur.pit() - 1, prev_par.size());
if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
cur.recordUndo(ATOMIC_UNDO, prev_cur.pit(), prev_cur.pit());
prev_cur.paragraph().setChange(prev_cur.lastpos(), Change(Change::DELETED));
setCursorIntern(cur, prev_cur.pit(), prev_cur.lastpos());
return true;
}
// The cursor is at the beginning of a paragraph, so

3
status.20x
View File

@ -137,6 +137,9 @@ What's new
- Fix a few selection bugs in tabular (bugs 4981, 7988).
- Handle properly undo after deleting a paragraph break when change
tracking is enabled (bug 8633).
- Fix `select whole inset' function in math editor.
- Fix confusing behavior in search when changing directions (bug 8543)