The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 146b754f1d61cb79a10ac727b529175a99f9b868 Author: Jean-Marc Lasgouttes <[email protected]> Date: Tue Dec 11 10:14:47 2012 +0100 Fix crash related to undo and continuous spell checking The cursor member new_word_ should not be saved in undo. Move it from CursorData to Cursor. diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 8afbdf3..4469875 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -286,6 +286,8 @@ void Cursor::reset() push_back(CursorSlice(buffer()->inset())); anchor_ = doc_iterator_begin(buffer()); anchor_.clear(); + new_word_ = doc_iterator_begin(buffer()); + new_word_.clear(); clearTargetX(); selection_ = false; mark_ = false; diff --git a/src/Cursor.h b/src/Cursor.h index 31debbf..d84db92 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -52,8 +52,6 @@ public: protected: /// the anchor position DocIterator anchor_; - /// the start of the new born word - DocIterator new_word_; /// mutable DispatchResult disp_; /// do we have a selection? @@ -394,6 +392,8 @@ private: int x_target_; /// if a x_target cannot be hit exactly in a text, put the difference here int textTargetOffset_; + /// the start of the new born word + DocIterator new_word_; /// position before dispatch started DocIterator beforeDispatchCursor_; /// cursor screen coordinates before dispatch started ----------------------------------------------------------------------- Summary of changes: src/Cursor.cpp | 2 ++ src/Cursor.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
