diff --git a/content/events.js b/content/events.js index b9a4d8cf..39a6d3a3 100644 --- a/content/events.js +++ b/content/events.js @@ -1185,7 +1185,6 @@ vimperator.Events = function () //{{{ map = vimperator.mappings.get(vimperator.mode, candidateCommand); - // counts must be at the start of a complete mapping (10j -> go 10 lines down) if (/^[1-9][0-9]*$/.test(vimperator.input.buffer + key)) { @@ -1288,7 +1287,10 @@ vimperator.Events = function () //{{{ stop = false; if (vimperator.mode == vimperator.modes.COMMAND_LINE) - vimperator.commandline.onEvent(event); // reroute event in command line mode + { + if (!(vimperator.modes.extended & vimperator.modes.INPUT_MULTILINE)) + vimperator.commandline.onEvent(event); // reroute event in command line mode + } else if (vimperator.mode != vimperator.modes.INSERT) vimperator.beep(); } diff --git a/content/ui.js b/content/ui.js index 1b44a47d..3cbe0304 100644 --- a/content/ui.js +++ b/content/ui.js @@ -727,6 +727,7 @@ vimperator.CommandLine = function () //{{{ if (event.type == "keypress") { var key = vimperator.events.toString(event); + vimperator.log(multilineInputWidget.value); if (vimperator.events.isAcceptKey(key)) { var text = multilineInputWidget.value.substr(0, multilineInputWidget.selectionStart); @@ -753,6 +754,7 @@ vimperator.CommandLine = function () //{{{ { autosizeMultilineInputWidget(); } + return true; }, // FIXME: if 'more' is set and the MOW is not scrollable we should still