gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-07 20:05:46 +01:00
Code Issues Projects Releases Wiki Activity

- g<esc> doesn't beep anymore

Browse Source 
- /<up><down> searches for the changed string
This commit is contained in:
Martin Stubenschrott
2007-09-24 12:41:59 +00:00
parent 2550e5d736
commit ca3f4282b3
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
chrome/content/vimperator/events.js
View File

@@ -735,11 +735,14 @@ function Events() //{{{
vimperator.input.pendingArgMap = null; vimperator.input.pendingArgMap = null;
vimperator.input.pendingMotionMap = null; vimperator.input.pendingMotionMap = null;
stop = false; // command was not a vimperator command, maybe it is a firefox command if (key != "<Esc>" && key != "<C-[>")
{
stop = false; // command was not a vimperator command, maybe it is a firefox command
// TODO: see if this check is needed or are all motion commands already mapped in these modes? // TODO: see if this check is needed or are all motion commands already mapped in these modes?
if (vimperator.mode != vimperator.modes.INSERT && vimperator.mode != vimperator.modes.COMMAND_LINE) if (vimperator.mode != vimperator.modes.INSERT && vimperator.mode != vimperator.modes.COMMAND_LINE)
vimperator.beep(); vimperator.beep();
}
} }
if (stop) if (stop)

9
chrome/content/vimperator/mappings.js
View File

@@ -306,7 +306,7 @@ function Mappings() //{{{
vimperator.modes.INSERT, vimperator.modes.INSERT,
vimperator.modes.VISUAL, vimperator.modes.VISUAL,
vimperator.modes.HINTS, vimperator.modes.HINTS,
//vimperator.modes.COMMAND_LINE, vimperator.modes.COMMAND_LINE,
vimperator.modes.CARET, vimperator.modes.CARET,
vimperator.modes.TEXTAREA]; vimperator.modes.TEXTAREA];
var any_non_insertmode = [vimperator.modes.NORMAL, var any_non_insertmode = [vimperator.modes.NORMAL,
@@ -1295,13 +1295,6 @@ function Mappings() //{{{
always_active: true always_active: true
} }
)); ));
/*addDefaultMap(new Map([vimperator.modes.HINTS], ["<Esc>", "<C-[>", "<C-c>"],
function() { ; },
{
cancel_mode: true,
always_active: true
}
));*/
// }}} // }}}
// Caret mode // Caret mode

4
chrome/content/vimperator/ui.js
View File

@@ -386,7 +386,6 @@ function CommandLine() //{{{
var mode = cur_extended_mode; // save it here, as setMode() resets it var mode = cur_extended_mode; // save it here, as setMode() resets it
history.add(command); history.add(command);
vimperator.modes.reset(true); //FIXME: use mode stack vimperator.modes.reset(true); //FIXME: use mode stack
//vimperator.focusContent();
completionlist.hide(); completionlist.hide();
vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
return vimperator.triggerCallback("submit", mode, command); return vimperator.triggerCallback("submit", mode, command);
@@ -398,7 +397,6 @@ function CommandLine() //{{{
var res = vimperator.triggerCallback("cancel", cur_extended_mode); var res = vimperator.triggerCallback("cancel", cur_extended_mode);
history.add(command); history.add(command);
vimperator.modes.set(old_mode, old_extended_mode); vimperator.modes.set(old_mode, old_extended_mode);
//vimperator.focusContent();
completionlist.hide(); completionlist.hide();
vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
this.clear(); this.clear();
@@ -433,6 +431,7 @@ function CommandLine() //{{{
if (history_index == lines.length) if (history_index == lines.length)
{ {
setCommand(history_start); setCommand(history_start);
vimperator.triggerCallback("change", cur_extended_mode, this.getCommand());
return; return;
} }
@@ -453,6 +452,7 @@ function CommandLine() //{{{
if (lines[history_index].indexOf(history_start) == 0) if (lines[history_index].indexOf(history_start) == 0)
{ {
setCommand(lines[history_index]); setCommand(lines[history_index]);
vimperator.triggerCallback("change", cur_extended_mode, this.getCommand());
return; return;
} }
} }