revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 253b43feed7d014d2e6a22d1cbb21707362f8776..809c8babca05234c52eca85cca2bdac8d7de2261 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -150,6 +150,12 @@ void BufferView::scrollDocView(int value)
 }
 
 
+void BufferView::setCursorFromScrollbar()
+{
+       pimpl_->setCursorFromScrollbar();
+}
+
+
 bool BufferView::available() const
 {
        return pimpl_->available();
@@ -232,12 +238,6 @@ void BufferView::workAreaResize(int width, int height)
 }
 
 
-void BufferView::workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state)
-{
-       pimpl_->workAreaKeyPress(key, state);
-}
-
-
 bool BufferView::workAreaDispatch(FuncRequest const & ev)
 {
        return pimpl_->workAreaDispatch(ev);
@@ -322,11 +322,13 @@ void BufferView::mouseSetCursor(LCursor & cur)
        BOOST_ASSERT(&cur.bv() == this);
 
        // Has the cursor just left the inset?
+       bool badcursor = false;
        if (&cursor().inset() != &cur.inset())
-               cursor().inset().notifyCursorLeaves(cursor());
+               badcursor = cursor().inset().notifyCursorLeaves(cursor());
 
        // do the dEPM magic if needed
-       if (cursor().inTexted())
+       // FIXME: move this to InsetText::notifyCursorLeaves?
+       if (!badcursor && cursor().inTexted())
                cursor().text()->deleteEmptyParagraphMechanism(cur, cursor());
 
        cursor() = cur;