Hello, next patch:
the use of backspacePos0 is dangerous as it does not honour change tracking => make it a private method; clarify the description of backspacePos0 (it does not always merge paragraphs) As usual: committed! Michael
Index: lyxtext.h =================================================================== --- lyxtext.h (Revision 16028) +++ lyxtext.h (Arbeitskopie) @@ -231,11 +231,6 @@ bool cursorBottom(LCursor & cur); /// Erase character at cursor. Honour change tracking bool erase(LCursor & cur); - /** At cursor position 0, merge paragraph with the one before it. - * Ignore CT (this is used in \c acceptChange, \c rejectChange for - * physical deletion of paragraph break) - */ - bool backspacePos0(LCursor & cur); /// Delete character before cursor. Honour CT bool backspace(LCursor & cur); // Dissolve the inset under cursor @@ -385,6 +380,10 @@ // position. Called by deleteEmptyParagraphMechanism void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where); + // At cursor position 0, try to merge the paragraph with the one before it. + // Ignore change tracking, i.e., physically remove the end-of-par character + bool backspacePos0(LCursor & cur); + /// void deleteWordForward(LCursor & cur); ///
