diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js index 8f5939b6..881ff6df 100644 --- a/chrome/content/vimperator/commands.js +++ b/chrome/content/vimperator/commands.js @@ -524,7 +524,7 @@ var g_mappings = [/*{{{*/ [ ["gP"], ["gP"], - "Open (put) an URL based on the current Clipboard contents in a new buffer", + "Open (put) an URL based on the current clipboard contents in a new buffer", "Works like P, but inverts the 'activate' setting.", function(count) { openURLsInNewTab(readFromClipboard(), false); } ], @@ -1969,11 +1969,15 @@ function set(args, special) function source(filename, silent) { - if (!filename) return; + if (!filename) + return; + try { var fd = fopen(filename, "<"); - if (!fd) return; + if (!fd) + return; + var s = fd.read(); fd.close(); diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js index a877834b..feabc514 100644 --- a/chrome/content/vimperator/help.js +++ b/chrome/content/vimperator/help.js @@ -62,6 +62,7 @@ table.vimperator td {\ }\ tr.tag {\ text-align: right;\ + border-spacing: 13px 10px 13px 10px;\ }\ tr.tag td {\ width: 100%;\ @@ -75,8 +76,8 @@ td.usage code {\ }\ tr.tag code {\ font-weight: bold;\ - font-size: 1opx;\ - font-color: red;\ + font-size: 12px;\ + color: red;\ margin-left: 2em;\ }\ tr.desciption {\ diff --git a/chrome/content/vimperator/hints.js b/chrome/content/vimperator/hints.js index 9bb8f67f..b0d11984 100644 --- a/chrome/content/vimperator/hints.js +++ b/chrome/content/vimperator/hints.js @@ -207,7 +207,7 @@ function hit_a_hint() offset = off; // must be global without 'var' for recursion if (!win) - win = window._content; + win = window.content; if (linkCount == 0 && hintmode != HINT_MODE_ALWAYS) { diff --git a/chrome/content/vimperator/settings.js b/chrome/content/vimperator/settings.js index c0bfb9a6..4388800e 100644 --- a/chrome/content/vimperator/settings.js +++ b/chrome/content/vimperator/settings.js @@ -127,6 +127,7 @@ var g_settings = [/*{{{*/ ["hintchars", "hc"], ["hintchars", "hc"], "String of single characters which can be used to follow hints", + null, "charlist", null, function(value) { set_pref("hintchars", value); }, diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js index 6b6bbaa7..2f647608 100644 --- a/chrome/content/vimperator/vimperator.js +++ b/chrome/content/vimperator/vimperator.js @@ -330,7 +330,6 @@ function onVimperatorKeypress(event)/*{{{*/ { // never propagate this key to firefox, when hints are visible event.preventDefault(); - event.preventBubble(); event.stopPropagation(); for (i = 0; i < g_hint_mappings.length; i++) @@ -452,7 +451,6 @@ function onVimperatorKeypress(event)/*{{{*/ g_inputbuffer = ""; updateStatusbar(); event.preventDefault(); - event.preventBubble(); event.stopPropagation(); return false; } @@ -467,16 +465,12 @@ function onVimperatorKeypress(event)/*{{{*/ { g_inputbuffer += key; event.preventDefault(); - event.preventBubble(); event.stopPropagation(); } else { g_inputbuffer = ""; beep(); -// event.preventDefault(); -// event.preventBubble(); XXX: -// event.stopPropagation(); } updateStatusbar(); @@ -669,7 +663,6 @@ function onCommandBarKeypress(evt)/*{{{*/ // prevent tab from moving to the next field evt.preventDefault(); - evt.preventBubble(); evt.stopPropagation(); }