Merge branch 'master' into vimperator-2.1

Conflicts: common/content/io.js vimperator/locale/en-US/starting.txt
2026-02-07 00:55:44 +01:00 · 2009-01-15 03:14:08 -05:00
parent d9b07c2ff6 0b682ef42b
commit fbcaeaded1
58 changed files with 1395 additions and 1006 deletions
--- a/vimperator/AUTHORS
+++ b/vimperator/AUTHORS
@@ -11,7 +11,7 @@ Developers:
 Inactive/former developers:
  * Viktor Kojouharov (Виктор Кожухаров)
  * Marco Candrian (mac@calmar.ws)
- 
+
 Patches (in no special order):
  * Ruud Grosmann ('followhints' option)
  * Xie&Tian (multibyte support for hints)
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -1,4 +1,7 @@
 2009:
+* InspireFocus
+* Michael Fremont
+* Kamil Dworakowski
 * Jonathan Austin
 * Steven Romanow

@@ -11,10 +14,10 @@
 * Mats Vestin
 * Berni Joss
 * Peter Rufer
-* Yann Le Du 
+* Yann Le Du
 * Wilson Bilkovich
 * Galen Taylor
-* Ben Hoffstein 
+* Ben Hoffstein
 * Luc St-Louis
 * Robert Meerman
 * Silvio Di Stefano
@@ -29,8 +32,8 @@
 * Ryan McBride
 * Brian Clark
 * Gavin Gilmour
-* Sivaraj Doddannan 
-* Michael Hrabanek 
+* Sivaraj Doddannan
+* Michael Hrabanek
 * Nigel McNie
 * Ben Damm
 * Anton Kovalenko
@@ -47,7 +50,7 @@
 * Ted Pavlic
 * Jacqueline Wegscheid
 * Kashyap Paidimarri
-* Gabriel Gellner 
+* Gabriel Gellner
 * Marco Candrian
 * Ovidiu Curcan
 * Ivo-Jose Jimenez-Ramos (2x)
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -20,20 +20,19 @@ BUGS:
 - http://cgiirc.blitzed.org?chan=%23debug is unusable after login in

 (recent CVS regressions):
- visual caret mode is broken
- the message system is a bit of a debacle at the moment but I'm not sure how
-  it's supposed to work. MST, can you spec it when you have some time?
-  E.g. :ls | :echomsg "Foobar" doesn't add "Foobar" to the already open MOW.
-  Obviously I think it should but I'm not sure if it's a bug or not in your
-  view, thanks. --djk
-  The spec is easy: echomsg() is used for informational purposes, and should therefore
-  never need user interaction. Therefore: If the MOW is open, print the message there,
-  but never open the MOW for an echomsg(). --mst
- While the old :open foo<tab> was broken/annoying, so is the one after 02-01-2008, as
-  I am often waiting ~20sec or more after doing :open not-cached-things<tab>.
-  We should probably just abort searching after 5 secs if we already have found some entries.
 - :set noflashblock seems broken (= :set fb? afterwards says "fb"), let's see if that's a
  plugin or a vimp issue.
+- visual caret mode is broken, requires a manual page focus first anyway or
+  else it chucks, I haven't investigated --djk
+- messages is still broken in several ways - needs testing.
+  => :ls | :echomsg "Foobar" doesn't add "Foobar" to the already open MOW.
+  => it often overwrites the open command-line while editing etc.
+- <tags> and <keyword> autocmd 'keywords' are not available when adding a
+  bookmark - they're being set after the observer triggers the autocmd event.
+- MOW is broken for multiple commands when open E.g. :ls | ls
+- completion height is broken, try :a<tab>....<tab>, when it wraps it's totally off.
+  and even if it is not totally off, i had it jump by one pixel when wrapping around.
+  If that's unfixable, i propose reverting the new completion height stuff.

 FEATURES:
 9 finish :help TODOs
@@ -86,14 +85,14 @@ FEATURES:
 6 Use ctrl-w+j/k/w to switch between sidebar, content, preview window
 6 Command :tags for getting a list of used tags
 6 ;?<hint> should show more information
-5 when looking at a zoomed out image (because it's large), zi should zoom in 
+5 when looking at a zoomed out image (because it's large), zi should zoom in
  maybe with this? : http://mxr.mozilla.org/seamonkey/source/content/html/document/public/nsIImageDocument.idl
 5 make a command to search within google search results
  (http://gadelkareem.com/2007/01/28/using-google-ajax-api-as-an-array/)
  maybe impossible, needs a per-site key from google
 4 } { should jump to the next paragraph of the page (maybe impossible)
-3 A format for 'guitablabel' and 'statusline' 
-3 add a command-line window (:help cmdline-window in Vim). 
+3 A format for 'guitablabel' and 'statusline'
+3 add a command-line window (:help cmdline-window in Vim).
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
  have a look into the split browser extension
 1 Add information to liberator/HACKING file about testing and optimization
--- a/vimperator/components/chrome-data.js
+++ b/vimperator/components/chrome-data.js
@@ -47,8 +47,8 @@ ChromeData.prototype = {
    defaultPort: -1,
    allowPort: function (port, scheme) false,
    protocolFlags: nsIProtocolHandler.URI_NORELATIVE
-		 | nsIProtocolHandler.URI_NOAUTH
-		 | nsIProtocolHandler.URI_IS_UI_RESOURCE,
+         | nsIProtocolHandler.URI_NOAUTH
+         | nsIProtocolHandler.URI_IS_UI_RESOURCE,

    newURI: function (spec, charset, baseURI)
    {
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.

-(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -792,9 +792,9 @@ function History() //{{{
        function (args) { history.list(args.join(" "), args.bang, args["-max"] || 1000); },
        {
            bang: true,
-            completer: function (context) { context.quote = null, completion.history(context); },
-            options: [[["-max", "-m"], options.OPTION_INT]]
+            completer: function (context) { context.quote = null; completion.history(context); },
            // completer: function (filter) completion.history(filter)
+            options: [[["-max", "-m"], options.OPTION_INT]]
        });

    /////////////////////////////////////////////////////////////////////////////}}}
@@ -962,7 +962,14 @@ function QuickMarks() //{{{
            else
                quickmarks.remove(args.string);
        },
-        { bang: true });
+        {
+            bang: true,
+            completer: function (context)
+            {
+                context.title = ["QuickMark", "URL"];
+                context.completions = qmarks;
+            }
+        });

    commands.add(["qma[rk]"],
        "Mark a URL with a letter for quick access",
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.

-(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
--- a/vimperator/content/vimperator.xul
+++ b/vimperator/content/vimperator.xul
@@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.

-(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
--- a/vimperator/locale/en-US/Makefile
+++ b/vimperator/locale/en-US/Makefile
@@ -0,0 +1 @@
+../../../common/Makefile.doc
--- a/vimperator/locale/en-US/browsing.txt
+++ b/vimperator/locale/en-US/browsing.txt
@@ -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
--- a/vimperator/locale/en-US/hints.txt
+++ b/vimperator/locale/en-US/hints.txt
@@ -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:
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -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 +
--- a/vimperator/locale/en-US/map.txt
+++ b/vimperator/locale/en-US/map.txt
@@ -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

--- a/vimperator/locale/en-US/marks.txt
+++ b/vimperator/locale/en-US/marks.txt
@@ -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]
 ________________________________________________________________________________


--- a/vimperator/locale/en-US/starting.txt
+++ b/vimperator/locale/en-US/starting.txt
@@ -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:

--- a/vimperator/locale/en-US/xhtml11.css
+++ b/vimperator/locale/en-US/xhtml11.css
@@ -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;
--- a/vimperator/regressions.js
+++ b/vimperator/regressions.js
@@ -94,7 +94,6 @@ function getBufferPosition()

 function getLocation() window.content.document.location.href;

-
 function echoLine(str, group)
 {
    if (!doc)
--- a/vimperator/vimperator.vim
+++ b/vimperator/vimperator.vim
@@ -23,12 +23,12 @@ syn keyword vimperatorCommand ab[breviate] ab[clear] addo[ns] b[uffer] ba[ck] bd
    \ cm[ap] cmapc[lear] cno[remap] comc[lear] com[mand] cu[nmap] do[autocmd] doautoa[ll] delbm[arks] delc[ommand] delmac[ros]
    \ delm[arks] delqm[arks] dels[tyle] dia[log] dl downl[oads] e[dit] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute] exu[sage]
    \ fini[sh] files fo[rward] fw h[elp] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap]
-    \ iuna[bbrev] iu[nmap] javas[cript] ju[mps] js let loadplugins lpl ls macros ma[rk] map mapc[lear] marks mes[sages] 
-    \ mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen] optionu[sage] pa[geinfo] pagest[yle] pc[lose] pl[ay] pref[erences] 
-    \ prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] re[load] reloada[ll] res[tart] run runt[ime] sty[le] sav[eas] 
-    \ sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] sideb[ar] so[urce] st[op] tN[ext] t[open] tab 
-    \ tabde[tach] tabd[uplicate] tabN[ext] tabc[lose] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen 
-    \ tabp[revious] tabr[ewind] tabs time tn[ext] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] ve[rsion] 
+    \ iuna[bbrev] iu[nmap] javas[cript] ju[mps] js let loadplugins lpl ls macros ma[rk] map mapc[lear] marks mes[sages]
+    \ mkv[imperatorrc] no[remap] noh[lsearch] norm[al] o[pen] optionu[sage] pa[geinfo] pagest[yle] pc[lose] pl[ay] pref[erences]
+    \ prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw] re[load] reloada[ll] res[tart] run runt[ime] sty[le] sav[eas]
+    \ sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal] sideb[ar] so[urce] st[op] tN[ext] t[open] tab
+    \ tabde[tach] tabd[uplicate] tabN[ext] tabc[lose] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen
+    \ tabp[revious] tabr[ewind] tabs time tn[ext] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] ve[rsion]
    \ vie[wsource] viu[sage] w[rite] wc[lose] win[open] winc[lose] wine[dit] wo[pen] wqa[ll] wq xa[ll] zo[om]
 	\ contained