cleanup error messages

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 024fdb14e7cd7d619977637a955a850f652cbb6b..b3f25f5353dbd63886475ccb7959ccf6c5d0931a 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -142,7 +142,7 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
        int new_id = cur.paragraph().id();
 
        // if bottom_pit, bottom_pos or top_id has been changed, update bookmark
-       // see http://bugzilla.lyx.org/show_bug.cgi?id=3092
+       // see http://www.lyx.org/trac/ticket/3092
        if (bm.bottom_pit != new_pit || bm.bottom_pos != new_pos 
                || bm.top_id != new_id) {
                const_cast<BookmarksSection::Bookmark &>(bm).updatePos(
@@ -390,9 +390,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        // FIXME: this LFUN should also work without any view.
                        Buffer * buffer = (lv && lv->documentBufferView())
                                ? &(lv->documentBufferView()->buffer()) : 0;
-                       buffer = &lv->currentBufferView()->buffer();
-                       if (buffer && !theBufferList().isLoaded(buffer))
-                               buffer = 0;
                        if (buffer)
                                buffer->undo().beginUndoGroup();
                        while (!arg.empty()) {
@@ -402,7 +399,8 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                func.origin = cmd.origin;
                                dispatch(func);
                        }
-                       if (buffer)
+                       // the buffer may have been closed by one action
+                       if (theBufferList().isLoaded(buffer))
                                buffer->undo().endUndoGroup();
                        break;
                }
@@ -543,20 +541,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                }
                        }
 
-                       // Is this a function that acts on inset at point?
-                       Inset * inset = bv->cursor().nextInset();
-                       if (lyxaction.funcHasFlag(action, LyXAction::AtPoint)
-                           && inset) {
-                               bv->cursor().result().dispatched(true);
-                               bv->cursor().result().update(Update::FitCursor | Update::Force);
-                               FuncRequest tmpcmd = cmd;
-                               inset->dispatch(bv->cursor(), tmpcmd);
-                               if (bv->cursor().result().dispatched()) {
-                                       updateFlags = bv->cursor().result().update();
-                                       break;
-                               }
-                       }
-
                        // Let the current Cursor dispatch its own actions.
                        Cursor old = bv->cursor();
                        bv->cursor().getPos(cursorPosBeforeDispatchX_,