mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-28 00:22:26 +01:00
Merge branch 'master' into vimperator-2.1
Conflicts: common/content/io.js vimperator/locale/en-US/starting.txt
This commit is contained in:
Kris Maglione
1
vimperator/locale/en-US/Makefile
Symbolic link
1
vimperator/locale/en-US/Makefile
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/Makefile.doc
|
||||
@@ -40,21 +40,21 @@ The first URL is opened in the current tab, and all other URLs are
|
||||
opened in new tabs.
|
||||
Each token is analyzed and in this order:
|
||||
|
||||
. Opened as a local file if it is an existing relative or absolute filename.
|
||||
* [c]:open /etc/fstab[c] shows the file system table.
|
||||
* [c]:open ../other/foo.html[c] in your home directory opens
|
||||
[a]/home/other/foo.html[a]
|
||||
. Opened with the specified search engine if the token looks like a search
|
||||
string and the first word is the name of a search engine ([c]:open wikipedia
|
||||
linus torvalds[c] opens the Wikipedia entry for linus torvalds). The short
|
||||
name of a search engine is automatically guessed from its name. If you want
|
||||
to set a custom name, you can change it with [c]:dialog searchengines[c].
|
||||
. Opened with the default search engine or keyword (specified with the
|
||||
'defsearch' option) if the first word is no search engine ([c]:open linus
|
||||
torvalds[c] opens a Google search for linux torvalds).
|
||||
. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
|
||||
www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
|
||||
background tab).
|
||||
1. Opened as a local file if it is an existing relative or absolute filename.
|
||||
- [c]:open /etc/fstab[c] shows the file system table.
|
||||
- [c]:open ../other/foo.html[c] in your home directory opens
|
||||
[a]/home/other/foo.html[a]
|
||||
2. Opened with the specified search engine if the token looks like a search
|
||||
string and the first word is the name of a search engine ([c]:open wikipedia
|
||||
linus torvalds[c] opens the Wikipedia entry for linus torvalds). The short
|
||||
name of a search engine is automatically guessed from its name. If you want
|
||||
to set a custom name, you can change it with [c]:dialog searchengines[c].
|
||||
3. Opened with the default search engine or keyword (specified with the
|
||||
'defsearch' option) if the first word is no search engine ([c]:open linus
|
||||
torvalds[c] opens a Google search for linux torvalds).
|
||||
4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
|
||||
www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
|
||||
background tab).
|
||||
|
||||
You can use [c]:open -tags linux torvalds<Tab>[c] to complete bookmarks with
|
||||
tag "linux" and which contain "torvalds". Note that -tags support is only
|
||||
|
||||
@@ -22,8 +22,10 @@ ________________________________________________________________________________
|
||||
|F| +
|
||||
||#F#{hint}||
|
||||
________________________________________________________________________________
|
||||
Start QuickHint mode, but open link in a new tab. Like normal QuickHint mode
|
||||
(activated with [m]f[m]) but opens the link in a new tab.
|
||||
Start QuickHint mode, but open link in a new tab. Like normal QuickHint
|
||||
mode (activated with [m]f[m]) but opens the link in a new tab. The new
|
||||
tab will be loaded in background according to the
|
||||
\'browser.tabs.loadInBackground' Firefox preference.
|
||||
________________________________________________________________________________
|
||||
|
||||
|
||||
@@ -49,9 +51,9 @@ this hint mode. Then press [a]24[a] to copy the hint location.
|
||||
* |;b| [m]b[m] to open its location in a new background tab
|
||||
* |;w| [m]w[m] to open its destination in a new window
|
||||
* |;F| [m]F[m] to follow a sequence of [m]<CR>[m]-delimited hints in background tabs
|
||||
* |;O| [m]O[m] to preselect its location in an [c]:open[c] query
|
||||
* |;T| [m]T[m] to preselect its location in a [c]:tabopen[c] query
|
||||
* |;W| [m]W[m] to preselect its location in a [c]:winopen[c] query
|
||||
* |;O| [m]O[m] to [c]:open[c] a URL based on hint location
|
||||
* |;T| [m]T[m] to [c]:tabopen[c] a URL based on its location
|
||||
* |;W| [m]W[m] to [c]:winopen[c] a URL based on its location
|
||||
* |;v| [m]v[m] to view its destination source
|
||||
* |;V| [m]V[m] to view its destination source in the external editor
|
||||
* |;y| [m]y[m] to yank its destination location
|
||||
@@ -59,9 +61,6 @@ this hint mode. Then press [a]24[a] to copy the hint location.
|
||||
|
||||
Hintable elements for all extended hint modes can be set in the
|
||||
'extendedhinttags' XPath string.
|
||||
|
||||
Note: The behavior of [m];t[m] and [m];b[m] is inverted if the
|
||||
\'browser.tabs.loadInBackground' Firefox preference is set to false.
|
||||
________________________________________________________________________________
|
||||
|
||||
// vim: set syntax=asciidoc:
|
||||
|
||||
@@ -197,7 +197,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
|
||||
||:mapclear|| Remove all mappings +
|
||||
||:mark|| Mark current location within the web page +
|
||||
||:marks|| Show all location marks of current web page +
|
||||
||:messages|| Display previously given messages +
|
||||
||:messages|| Display previously given messages +
|
||||
||:mkvimperatorrc|| Write current key mappings and changed options to the config file +
|
||||
||:nohlsearch|| Remove the search highlighting +
|
||||
||:noremap|| Map a key sequence without remapping keys +
|
||||
|
||||
@@ -316,7 +316,7 @@ Completion can be enabled by specifying one of the following arguments to the
|
||||
*sidebar* sidebar panels
|
||||
*url* URLs
|
||||
*usercommand* user commands
|
||||
*custom,{func}* custom completion, provided by {func}
|
||||
*custom,{func}* custom completion, provided by {func}
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
|E467| |E468| |:command-completion-custom| +
|
||||
@@ -330,7 +330,7 @@ properties, describing the completions and where the replacement is to start.
|
||||
|
||||
*start* is the index into the word being completed at which the returned values
|
||||
should be applied and *completions* is a two dimensional array of the form:
|
||||
\[[arg1, description1], [arg2, description2], ...]
|
||||
[[arg1, description1], [arg2, description2], ...]
|
||||
|
||||
// TODO: add examples
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@ ________________________________________________________________________________
|
||||
||:qma[rk] {a-zA-Z0-9} [a][url][a]|| +
|
||||
________________________________________________________________________________
|
||||
Mark a URL with a letter for quick access. You can also mark whole groups like this: +
|
||||
[c]:qmark f \http://forum1.com, \http://forum2.com, imdb some artist[c]
|
||||
[c]:qmark f +++http://forum1.com+++, +++http://forum2.com+++, imdb some artist[c]
|
||||
________________________________________________________________________________
|
||||
|
||||
|
||||
|
||||
@@ -7,28 +7,28 @@ section:Initialization[initialization,startup]
|
||||
|
||||
At startup, Vimperator completes the following tasks in order.
|
||||
|
||||
. Vimperator can perform user initialization commands. When
|
||||
1. Vimperator can perform user initialization commands. When
|
||||
one of the following is successfully located, it is executed, and no
|
||||
further locations are tried.
|
||||
|
||||
.. |$VIMPERATOR_INIT| _$VIMPERATOR_INIT_ -- May contain a single ex
|
||||
a. |$VIMPERATOR_INIT| _$VIMPERATOR_INIT_ -- May contain a single ex
|
||||
command (e.g.,
|
||||
"[c]:source {file}[c]").
|
||||
.. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its
|
||||
b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its
|
||||
contents are executed and
|
||||
_$MY_VIMPERATORRC_ set to its path.
|
||||
.. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are
|
||||
c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are
|
||||
executed.
|
||||
|
||||
. If 'exrc' is set, then any RC file in the current directory is also sourced.
|
||||
2. If 'exrc' is set, then any RC file in the current directory is also sourced.
|
||||
|
||||
. All directories in 'runtimepath' are searched for a "plugin"
|
||||
subdirectory and all yet unloaded plugins are loaded. For each
|
||||
plugin directory, all *.\{js,vimp} files (including those in further
|
||||
subdirectories) are sourced alphabetically. No plugins will be sourced
|
||||
if 'noloadplugins' is set. Any particular plugin will not be loaded
|
||||
if it has already been loaded (e.g., by an earlier [c]:loadplugins[c]
|
||||
command).
|
||||
3. All directories in 'runtimepath' are searched for a "plugin"
|
||||
subdirectory and all yet unloaded plugins are loaded. For each
|
||||
plugin directory, all *.\{js,vimp} files (including those in further
|
||||
subdirectories) are sourced alphabetically. No plugins will be sourced
|
||||
if 'noloadplugins' is set. Any particular plugin will not be loaded
|
||||
if it has already been loaded (e.g., by an earlier [c]:loadplugins[c]
|
||||
command).
|
||||
|
||||
The user's ~ (i.e., "home") directory is determined as follows:
|
||||
|
||||
|
||||
@@ -125,13 +125,13 @@ ul, body dir, body menu {
|
||||
}
|
||||
|
||||
html {
|
||||
margin: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
body h1, body h2, body h3, body h4, body h5, body h6 {
|
||||
margin-left: 0
|
||||
}
|
||||
}
|
||||
|
||||
body pre {
|
||||
margin: 0.5em 10% 0.5em 1em;
|
||||
|
||||
Reference in New Issue
Block a user