From a7c5da9f6f1eee48355843bfdf38d08ad78056a3 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 9 Nov 2009 03:28:39 +1100 Subject: [PATCH 1/2] Restore :helpall. --- common/content/liberator.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/content/liberator.js b/common/content/liberator.js index 2ab21379..8d72c859 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -864,10 +864,10 @@ const liberator = (function () //{{{ completion.help = function help(context, unchunked) { context.title = ["Help"]; context.anchored = false; - context.key = unchunked; + context.key = !!unchunked; // XXX: better as a precondition context.completions = services.get("liberator:").HELP_TAGS; if (unchunked) - context.keys = { text: "text", description: function () "all" }; + context.keys = { text: 0, description: function () "all" }; }; completion.menuItem = function menuItem(context) { @@ -1394,7 +1394,7 @@ const liberator = (function () //{{{ { if (topic in services.get("liberator:").FILE_MAP) return topic; - unchunked = !!unchunked; + let items = completion._runCompleter("help", topic, null, unchunked).items; let partialMatch = null; @@ -1505,9 +1505,9 @@ const liberator = (function () //{{{ */ help: function (topic, unchunked) { - if (!topic && !unchunked) + if (!topic) { - let helpFile = options["helpfile"]; + let helpFile = unchunked ? "all" : options["helpfile"]; if (helpFile in services.get("liberator:").FILE_MAP) liberator.open("liberator://help/" + helpFile, { from: "help" }); else From 865e075953ef312fbfe2722b01cb5d57676013d1 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 9 Nov 2009 03:52:26 +1100 Subject: [PATCH 2/2] Bump Vimperator's version string and fix the 2.2 NEWS entry again. --- vimperator/Makefile | 2 +- vimperator/NEWS | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vimperator/Makefile b/vimperator/Makefile index 77cba149..893488c9 100644 --- a/vimperator/Makefile +++ b/vimperator/Makefile @@ -1,6 +1,6 @@ #### configuration -VERSION = 2.2 +VERSION = 2.3a1pre NAME = vimperator include ../common/Makefile diff --git a/vimperator/NEWS b/vimperator/NEWS index 909f89d5..67bee9c0 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -1,11 +1,12 @@ 2009-XX-XX: + * version 2.3a1pre * add basic plugin authorship documentation * plugins may now provide full-fleged ':help' documentation * asciidoc is no longer required to build Vimperator * the help system is newly modularized -2009-XX-XX: - * version 2.2a1pre +2009-10-28: + * version 2.2 * IMPORTANT: Vimperator's licence has changed from the MPL/GPL/LGPL tri-license to the MIT license. * IMPORTANT: Map.flags has been replaced with individual properties.