From b902aaa8ba2de0fe9fa11ba9effdb4018fb9ff66 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 17 Jan 2007 16:01:49 +0000 Subject: [PATCH] * text.C (breakParagraph): when tracking changes, do not remove 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 --- src/ChangeLog | 5 +++++ src/text.C | 4 +++- status.14x | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index fa264c8c6c..21859dd22a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-01-17 Martin Vermeer + + * 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 * text3.C (doDispatch): recordUndo on LFUN_BREAKLINE (bug 3111). diff --git a/src/text.C b/src/text.C index 2873bbab3e..87259eadf7 100644 --- a/src/text.C +++ b/src/text.C @@ -1099,7 +1099,9 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout) 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); updateCounters(cur.buffer()); diff --git a/status.14x b/status.14x index fb6a57a109..f0e235e800 100644 --- a/status.14x +++ b/status.14x @@ -112,6 +112,9 @@ What's new windows). This fix was already used by the official windows installer for 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 and 2933). @@ -155,6 +158,8 @@ What's new - 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). - Fix spellckecking of Norwegian documents with aspell (bug 2850).