From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Fri, 24 Nov 2006 22:26:22 +0000 (+0000)
Subject: 	* src/lyxtext.h: the use of backspacePos0 is dangerous as it
X-Git-Tag: 1.6.10~11778
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3c348b6486009a6bd4ca5efd7cead4dc7b7c151c;p=features.git

	* src/lyxtext.h: 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)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16033 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/lyxtext.h b/src/lyxtext.h
index db13b054b2..db04130328 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -231,11 +231,6 @@ public:
 	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 @@ private:
 	// 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);
 	///