added a parseError signal to Buffer and use it

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 2b3496b90c620cc190628386295b620be03e6c5c..8ded18b4d1ba5ae66e988253ddcbd4e0c1717398 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -27,6 +27,7 @@
 #include "box.h"
 #include "language.h"
 #include "support/tostr.h"
+#include "support/lstrings.h"
 #include "frontends/LyXView.h"
 #include "frontends/screen.h"
 #include "frontends/Dialogs.h"
@@ -342,10 +343,11 @@ void LyXText::cursorNext()
                }
        }
        bv()->screen().draw(bv()->text, bv(), new_y);
-       if (boost::next(cursor.row()) != rows().end()) {
+
+       RowList::iterator next_row = boost::next(cursor.row());
+       if (next_row != rows().end()) {
                LyXCursor cur;
-               setCursor(cur, boost::next(cursor.row())->par(),
-                         boost::next(cursor.row())->pos(), false);
+               setCursor(cur, next_row->par(), next_row->pos(), false);
                if (cur.y() < top_y() + bv()->workHeight()) {
                        cursorDown(true);
                }
@@ -1020,17 +1022,25 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                update();
                break;
 
-       case LFUN_PASTE:
+       case LFUN_PASTE: {
                cmd.message(_("Paste"));
                // clear the selection
                bv->toggleSelection();
                clearSelection();
                update();
-               pasteSelection();
+               size_t sel_index = 0;
+               string const & arg = cmd.argument;
+               if (isStrUnsignedInt(arg)) {
+                       size_t const paste_arg = strToUnsignedInt(arg);
+#warning FIXME Check if the arg is in the domain of available selections.
+                       sel_index = paste_arg;
+               }
+               pasteSelection(sel_index);
                clearSelection(); // bug 393
                update();
                bv->switchKeyMap();
                break;
+       }
 
        case LFUN_CUT:
                update();