bug 2298: cursorTop/Bottom/Home/End does not redraw after dEPM

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 535d7623deda38ceab0c5fbb3cdb01177972b77e..e5cc72d73857f4001d6e76f87c6abcf198227dbe 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -133,7 +133,7 @@ public:
        /// read-write access to individual paragraph
        Paragraph & getPar(pit_type pit) { return pars_[pit]; }
        // Returns the current font and depth as a message.
-       std::string LyXText::currentState(LCursor & cur);
+       std::string currentState(LCursor & cur);
 
        /** returns row near the specified
          * y-coordinate in given paragraph (relative to the screen).
@@ -209,20 +209,25 @@ public:
        ///
        bool cursorDownParagraph(LCursor & cur);
        ///
-       void cursorHome(LCursor & cur);
+       bool cursorHome(LCursor & cur);
        ///
-       void cursorEnd(LCursor & cur);
+       bool cursorEnd(LCursor & cur);
        ///
        bool cursorPrevious(LCursor & cur);
        ///
        bool cursorNext(LCursor & cur);
        ///
-       void cursorTop(LCursor & cur);
-       ///
-       void cursorBottom(LCursor & cur);
+       bool cursorTop(LCursor & cur);
        ///
+       bool cursorBottom(LCursor & cur);
+       /// Delete character at cursor. Honour change tracking
        bool Delete(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);
        ///
        bool selectWordWhenUnderCursor(LCursor & cur, lyx::word_location);
@@ -341,10 +346,6 @@ public:
        LyXFont current_font;
        /// the current font
        LyXFont real_current_font;
-       /// our buffer's default layout font. This is textclass specific
-       /* This is actually never initialized! Should be replaced by a
-        * defaultfont() method that looks at the textclass (easy). [JMarc]*/
-       LyXFont defaultfont_;
        ///
        int background_color_;