Let tm be a reference here as elsewhere

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 8d15c97907c426f956f4d77d0f8dc009e92cad5e..7edf9e25cfbb5610644e09ec9a55f28e90b65db1 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -868,7 +868,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
                d->cursor_.setCurrentFont();
                // Do not forget to reset the anchor (see #9912)
                d->cursor_.resetAnchor();
-               processUpdateFlags(Update::FitCursor);
+               processUpdateFlags(Update::Force | Update::FitCursor);
        }
 
        return success;
@@ -1264,7 +1264,10 @@ Inset * BufferView::editedInset(string const & name) const
 
 void BufferView::editInset(string const & name, Inset * inset)
 {
-       d->edited_insets_[name] = inset;
+       if (inset)
+               d->edited_insets_[name] = inset;
+       else
+               d->edited_insets_.erase(name);
 }
 
 
@@ -1901,10 +1904,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        // At least one complete cell is selected and inset is a table.
                        // Select all cells
                        cur.idx() = 0;
+                       cur.pit() = 0;
                        cur.pos() = 0;
                        cur.resetAnchor();
                        cur.selection(true);
                        cur.idx() = cur.lastidx();
+                       cur.pit() = cur.lastpit();
                        cur.pos() = cur.lastpos();
                } else {
                        // select current cell
@@ -2512,15 +2517,26 @@ bool BufferView::setCursorFromInset(Inset const * inset)
 
 void BufferView::gotoLabel(docstring const & label)
 {
+       FuncRequest action;
+       bool have_inactive = false;
        for (Buffer const * buf : buffer().allRelatives()) {
                // find label
                for (TocItem const & item : *buf->tocBackend().toc("label")) {
-                       if (label == item.str()) {
+                       if (label == item.str() && item.isOutput()) {
                                lyx::dispatch(item.action());
                                return;
                        }
+                       // If we find an inactive label, save it for the case
+                       // that no active one is there
+                       if (label == item.str() && !have_inactive) {
+                               have_inactive = true;
+                               action = item.action();
+                       }
                }
        }
+       // We only found an inactive label. Go there.
+       if (have_inactive)
+               lyx::dispatch(action);
 }
 
 
@@ -2592,7 +2608,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
                return false;
 
        bool need_anchor_change = false;
-       bool changed = d->cursor_.text()->deleteEmptyParagraphMechanism(cur, old,
+       bool changed = Text::deleteEmptyParagraphMechanism(cur, old,
                need_anchor_change);
 
        if (need_anchor_change)