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

* text.C (breakParagraph): when tracking changes, do not remove

Browse Source 
NewLine insets when change tracking is on (bug 2865).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@16732 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-01-17 16:01:49 +00:00
parent f18c730b36
commit b902aaa8ba
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-17 Martin Vermeer <martin.vermeer@hut.fi>
* text.C (breakParagraph): when tracking changes, do not remove
NewLine insets when change tracking is on (bug 2865).
2006-01-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2006-01-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* text3.C (doDispatch): recordUndo on LFUN_BREAKLINE (bug 3111). * text3.C (doDispatch): recordUndo on LFUN_BREAKLINE (bug 3111).

4
src/text.C
View File

@ -1099,7 +1099,9 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout)
pars_[next_par].applyLayout(tclass.defaultLayout()); pars_[next_par].applyLayout(tclass.defaultLayout());
} }
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) while (!cur.buffer().params().tracking_changes
&& !pars_[next_par].empty()
&& pars_[next_par].isNewline(0))
pars_[next_par].erase(0); pars_[next_par].erase(0);
updateCounters(cur.buffer()); updateCounters(cur.buffer());

5
status.14x
View File

@ -112,6 +112,9 @@ What's new
windows). This fix was already used by the official windows installer for windows). This fix was already used by the official windows installer for
1.4.3. 1.4.3.
- Fix hang when deleting a forced newling character in change tracking
mode (bug 2865).
- Fix crash when exiting empty superscript in math editor (bugs 2908 - Fix crash when exiting empty superscript in math editor (bugs 2908
and 2933). and 2933).
@ -155,6 +158,8 @@ What's new
- Add support for the chars-transpose LFUN (bug 2939). - Add support for the chars-transpose LFUN (bug 2939).
- Make insertion of forced newline undo-able (bug 3111).
- Only one undo step is needed to undo inset-dissolve (bug 2982). - Only one undo step is needed to undo inset-dissolve (bug 2982).
- Fix spellckecking of Norwegian documents with aspell (bug 2850). - Fix spellckecking of Norwegian documents with aspell (bug 2850).