Merge branch 'master' into vimperator-2.1

vimperator/content/bookmarks.js

@@ -734,9 +734,9 @@ function History() //{{{
             {
                 let sh = window.getWebNavigation().sessionHistory;
 
+                context.anchor = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index, 0, true))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
-                liberator.dump(context.items);
             },
             count: true,
             literal: 0
@@ -780,6 +780,7 @@ function History() //{{{
             {
                 let sh = window.getWebNavigation().sessionHistory;
 
+                context.anchor = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index + 1, sh.count))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
             },

vimperator/locale/en-US/index.txt

@@ -207,7 +207,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||:pageinfo|| Show various page information +
 ||:pagestyle|| Select the author style sheet to apply +
 ||:play|| Replay a recorded macro +
-||:preferences|| Show Firefox preferences +
+||:preferences|| Show Firefox preferences dialog +
 ||:pwd|| Print the current directory name +
 ||:qmark|| Mark a URL with a letter for quick access +
 ||:qmarks|| Show all QuickMarks +

vimperator/locale/en-US/options.txt

@@ -162,21 +162,18 @@ Environment variables are expanded for path options like 'cdpath' and
 'runtimepath'. The variable notation is _$VAR_ (terminated by a non-word
 character) or _$\\{VAR}_. _%VAR%_ is also supported on Windows.
 
-section:Setting{nbsp}Firefox{nbsp}options[firefox-options]
+section:Setting{nbsp}Firefox{nbsp}options[firefox-options,preferences]
 
-Most Firefox options are not touched/overridden by Vimperator. In order to set
-any of these preferences use either of the following:
+Firefox options can be viewed and set with the following commands:
 
 |:prefs| |:preferences|
 ||:pref[erences]||
 ________________________________________________________________________________
-Show Browser Preferences +
-You can change the browser preferences from this dialog. Be aware that not
-all Firefox preferences work, because Vimperator overrides some key
-bindings and changes Firefox's GUI.
+Show the Firefox preferences dialog. You can change the browser preferences
+from this dialog. Be aware that not all Firefox preferences work, because
+Vimperator overrides some key bindings and changes Firefox's GUI.
 ________________________________________________________________________________
 
-
 |:prefs!| |:preferences!|
 ||:pref[erences]!||
 ________________________________________________________________________________
@@ -184,7 +181,6 @@ Opens about:config in the current tab where you can change advanced Firefox
 preferences.
 ________________________________________________________________________________
 
-
 |:set!| |:set-!|
 ||:se[t]! {preference}={value}|| +
 ________________________________________________________________________________
@@ -192,6 +188,19 @@ Change any Firefox {preference} (those in the about:config window). You can also
 reset/delete those preferences with [c]:set! {preference}&[c].
 ________________________________________________________________________________
 
+|overridden-preferences| +
+
+Vimperator sets several Firefox preferences at startup. If this is undesirable,
+they can be changed to a different value in your RC file using
+[c]:set! {preference}={value}[c]
+
+The following preferences are set:
+
+* browser.startup.page
+* dom.popup_allowed_events
+
+// TODO: others?
+
 section:List{nbsp}of{nbsp}options[list-options]
 
 |\'act'| |\'activate'|
@@ -275,11 +284,9 @@ ____
 |\'eht'| |\'extendedhinttags'|
 ||'extendedhinttags' 'eht'|| string
 ____
-(default: +++//*[@onclick or @onmouseover
-or @onmousedown or @onmouseup or @oncommand or @class='lk' or @class='s'] |
-//input[not(@type='hidden')] | //a | //area | //iframe | //textarea | //button
-| //select | //xhtml:*[@onclick or @onmouseover or @onmousedown or @onmouseup
-or @oncommand or @class='lk' or @class='s'] |
+(default: +++//*[@onclick or @onmouseover or @onmousedown or @onmouseup or
+@oncommand or @class='lk' or @role='link'] | //input[not(@type='hidden')] | //a
+| //area | //iframe | //textarea | //button | //select |
 //xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe
 | //xhtml:textarea | //xhtml:button | //xhtml:select+++)
 
@@ -385,11 +392,10 @@ ____
 ||'hinttags' 'ht'|| string
 ____
 (default: +++//*[@onclick or @onmouseover or @onmousedown or @onmouseup or
-@oncommand or @class='lk' or @class='s'] | //input[not(@type='hidden')] | //a
-| //area | //iframe | //textarea | //button | //select | //xhtml:*[@onclick or
-@onmouseover or @onmousedown or @onmouseup or @oncommand or @class='lk' or
-@class='s'] | //xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area |
-//xhtml:iframe | //xhtml:textarea | //xhtml:button | //xhtml:select+++)
+@oncommand or @class='lk' or @role='link'] | //input[not(@type='hidden')] | //a
+| //area | //iframe | //textarea | //button | //select |
+//xhtml:input[not(@type='hidden')] | //xhtml:a | //xhtml:area | //xhtml:iframe
+| //xhtml:textarea | //xhtml:button | //xhtml:select+++)
 
 XPath string of hintable elements activated by [m]f[m] and [m]F[m]
 ____
@@ -601,6 +607,7 @@ ____
 (default: _$VIMPERATOR_RUNTIME_ or Unix, Mac: "\~/.vimperator", Windows: "\~/vimperator")
 
 List of directories searched for runtime files: +
+colors/ +
 macros/ +
 plugin/ +