From dcbfef703abef291dd21ca82b7bae56893130f72 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Sun, 13 Aug 2006 15:45:06 +0000 Subject: [PATCH] * dociterator.C (forwardPosNoDescend): when at the end of the inset, leave it, like forwardPos does (bug 2510). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14648 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/dociterator.C | 6 +++++- status.14x | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3db6c2f155..2f3a037680 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-08-13 Jean-Marc Lasgouttes + + * dociterator.C (forwardPosNoDescend): when at the end of the + inset, leave it, like forwardPos does (bug 2510). + 2006-08-12 Jean-Marc Lasgouttes * buffer.C (updateDocLang): update labels when changing language. diff --git a/src/dociterator.C b/src/dociterator.C index 565a43f894..9c016d1e8c 100644 --- a/src/dociterator.C +++ b/src/dociterator.C @@ -398,7 +398,11 @@ void DocIterator::forwardPosNoDescend() } //lyxerr << "... no next idx" << endl; - // otherwise we can't move on + // otherwise leave inset and jump over inset as a whole + pop_back(); + // 'top' is invalid now... + if (!empty()) + ++top().pos(); } diff --git a/status.14x b/status.14x index 8c0f2e4807..02aa019bd4 100644 --- a/status.14x +++ b/status.14x @@ -58,6 +58,8 @@ What's new - Fix crash on save (including dataloss) when the backup directory was invalid or not writeable(bug 2740). +- Fix lockup when accepting a change in a text inset (bug 2510). + - Update labels on screen when changing language. - Show an error box when failing to update the TeX Information dalog data.