Remove the XOpenIM test as lyxlookup.C has been buried.

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index cf61629c17c3a855c9dfc1bd5e88374847a29138..35967e636e816fa134f504fcc671879eb42448d2 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -258,9 +258,9 @@ bool BufferView::dispatch(FuncRequest const & ev)
 }
 
 
-int BufferView::scroll(long time)
+void BufferView::scroll(int lines)
 {
-       return pimpl_->scroll(time);
+       pimpl_->scroll(lines);
 }
 
 
@@ -315,7 +315,7 @@ bool BufferView::insertLyXFile(string const & filen)
 
        if (c == '#') {
                lyxerr[Debug::INFO] << "Will insert file with header" << endl;
-               res = buffer()->readFile(lex, text->cursor.par());
+               res = buffer()->readFile(lex, fname, text->cursor.par());
        } else {
                lyxerr[Debug::INFO] << "Will insert file without header"
                                    << endl;
@@ -556,7 +556,7 @@ bool BufferView::gotoLabel(string const & label)
 }
 
 
-void BufferView::menuUndo()
+void BufferView::undo()
 {
        if (!available())
                return;
@@ -573,7 +573,7 @@ void BufferView::menuUndo()
 }
 
 
-void BufferView::menuRedo()
+void BufferView::redo()
 {
        if (!available())
                return;