From d5b6e6ea3c969831de22a69218f73737cfac1c95 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 01:34:13 +1100 Subject: [PATCH 1/7] fix duplicate use of 'listing-tabs' help tag --- vimperator/locale/en-US/tabs.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index eedbfc44..a5ad54f7 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -2,8 +2,8 @@ HEADER |tabs| + -Tabs are used to be able to view many web pages at the same time. Each tab -contains exactly one buffer - multiple buffers per tab are not supported. As a +Tabs are used to be able to view many web pages at the same time. Each tab +contains exactly one buffer - multiple buffers per tab are not supported. As a result many buffer and tab commands are interchangeable. section:Listing{nbsp}tabs[listing-tabs] @@ -16,7 +16,7 @@ Show a list of buffers (=tabs) matching [filter]. Without [filter] list all tabs. ________________________________________________________________________________ -section:Opening{nbsp}tabs[listing-tabs] +section:Opening{nbsp}tabs[opening-tabs] |:tab| + ||:tab {cmd}|| From dd432fe6b117b3a5cabf58e33efccceeed328361 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 01:43:01 +1100 Subject: [PATCH 2/7] fix duplicate use of ':echoe' help tag --- vimperator/locale/en-US/eval.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index 0aa8c385..b7e51a8a 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -23,7 +23,7 @@ the result highlighted as ErrorMsg and saves it to the message history. ________________________________________________________________________________ -|:echoe| |:echomsg| +|:echom| |:echomsg| ||:echom[sg] {expr}|| + ________________________________________________________________________________ Echo the expression as an infomational message. Just like [c]:ec[ho][c], but From ece99169c575b6d0f1a882008ffcececbc3c70d6 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 02:05:57 +1100 Subject: [PATCH 3/7] fix typo in intro of tutorial.txt --- vimperator/locale/en-US/tutorial.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index 704d12ed..e83a3fcf 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -4,7 +4,7 @@ HEADER +++
+++ *This is a quickstart tutorial to help get new users up and running in -Vimperator. It is not indented as a full reference explaining all features.* +Vimperator. It is not intended as a full reference explaining all features.* +++
+++ section:Quick-start{nbsp}tutorial[tutorial] From 4d4ad5886c4faaf6558153f94d28cb0bb1a5625f Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 02:11:59 +1100 Subject: [PATCH 4/7] fix :dialog help formatting --- vimperator/locale/en-US/gui.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index 7587cb9c..b638402c 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -28,7 +28,7 @@ ________________________________________________________________________________ |:dia| |:dialog| -||:dia[log] [firefox-dialog]|| + +||:dia[log] [a][firefox-dialog][a]|| + ________________________________________________________________________________ Open a Firefox dialog. From 2290230e6515474ec0c5534e539bf13721706c2a Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 02:18:23 +1100 Subject: [PATCH 5/7] change "g." mapping to "g<" --- common/content/ui.js | 4 +--- vimperator/locale/en-US/index.txt | 2 +- vimperator/locale/en-US/message.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/common/content/ui.js b/common/content/ui.js index 374d72c7..328ce866 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -771,10 +771,8 @@ function CommandLine() //{{{ ["", ""], "Expand command line abbreviation", function () { editor.expandAbbreviation("c"); }); - // FIXME: Should be "g<" but that doesn't work unless it has a non-null - // rhs, getCandidates broken? mappings.add([modes.NORMAL], - ["g."], "Redisplay the last command output", + ["g<"], "Redisplay the last command output", function () { if (lastMowOutput) diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 7d79656c..0e8d6f3e 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -90,7 +90,7 @@ section:Normal{nbsp}mode[normal-index] ||[[|| Follow the link labeled \'prev', \'previous' or \'<' if it exists + ||g$|| Go to the last tab + -||g.|| Redisplay the last command output + +||g<|| Redisplay the last command output + ||g0|| Go to the first tab + ||g|| Print file information + ||gB|| Repeat last :buffer[!] command in reverse direction + diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt index 2f0125e5..134e4f90 100644 --- a/vimperator/locale/en-US/message.txt +++ b/vimperator/locale/en-US/message.txt @@ -12,8 +12,8 @@ Display previously given messages. ________________________________________________________________________________ -|g.| + -||g.|| +|g<| + +||g<|| ________________________________________________________________________________ Redisplay the last command output. Only the most recent command's output is available. From 6a653c0177c32bab790f29ccebf802b9045369b4 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 02:22:19 +1100 Subject: [PATCH 6/7] remove use of
element from :help as it's not defined in XHTML 1.1 --- vimperator/locale/en-US/asciidoc.conf | 2 +- vimperator/locale/en-US/intro.txt | 8 +++----- vimperator/locale/en-US/tutorial.txt | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf index 32d1e41e..e46c276d 100644 --- a/vimperator/locale/en-US/asciidoc.conf +++ b/vimperator/locale/en-US/asciidoc.conf @@ -21,7 +21,7 @@ email=stubenschrott@gmx.net [replacements] -LOGO=
+LOGO=
HEADER=
\[count\]=[count] \[args\]=[args] diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 77233aef..9870a57e 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -1,10 +1,10 @@ LOGO -+++
+++ ++++
+++ *First there was a Navigator, then there was an Explorer. Later it was time for a Konqueror. Now it's time for an Imperator, the VIMperator :)* -+++
+++ +++++++ section:Introduction[intro] @@ -30,13 +30,11 @@ more, you can either send me greetings, patches or make a donation: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -
-
+
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Of course as a believer in free open source software, only make a donation diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index e83a3fcf..2a3db0ef 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -2,10 +2,10 @@ HEADER // Initial revision: Sun Jun 8 10:07:05 UTC 2008 (penryu) -+++
+++ ++++
+++ *This is a quickstart tutorial to help get new users up and running in Vimperator. It is not intended as a full reference explaining all features.* -+++
+++ +++++++ section:Quick-start{nbsp}tutorial[tutorial] From 1b481067f4dc1a652a3f94de15518f6ebc8cc61d Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 17 Dec 2008 13:46:43 +1100 Subject: [PATCH 7/7] address Martin's intentional breaking of the message system --- common/content/liberator.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/content/liberator.js b/common/content/liberator.js index 0d88cfc8..9ea86e1f 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -740,6 +740,16 @@ const liberator = (function () //{{{ // TODO: is there a reason for this? --djk // yes, it doesn't show the MOW on startup if you have e.g. some qmarks in your vimperatorrc. // Feel free to add another flag like DONT_OPEN_MULTILINE if really needed --mst + // + // But it's _supposed_ to show the MOW on startup when there are + // messages, surely? As far as I'm concerned it essentially works + // exactly as it should with the DISALLOW_MULTILINE flag removed. + // Sending N messages to the command-line in a row and having them + // overwrite each other is completely broken. I also think many of + // those messages like "Added quick mark" are plain silly but if + // you don't like them you can set verbose=0, or use :silent when + // someone adds it. I reckon another flag and 'class' of messages + // is just going to unnecessarily complicate things. --djk flags |= commandline.APPEND_TO_MESSAGES | commandline.DISALLOW_MULTILINE; if (verbosity == null)