diff --git a/ChangeLog b/ChangeLog index 25e582a2..96214840 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@
2007-07-02:
* version ???
+ * Changed "|" to ", " as a url seperator in :open
* Ctrl-^ mapping for selecting the alternate tab/buffer
* QuickMarks support (new commands :qmarks/:qmarkadd/:qmarkdel and
mappings go{a-z}, gn{a-z} and M{a-z}
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 1864fa45..b6156820 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -569,8 +569,8 @@ function Commands() //{{{
{
usage: ["o[pen] [url] [| url]"],
short_help: "Open one or more URLs in the current tab",
- help: "Multiple URLs can be separated with the | character.
" +
- "Each |-separated token is analyzed and in this order:
" +
+ help: "Multiple URLs can be separated with \", \". Note that the space after the comma is required.
" +
+ "Each token is analyzed and in this order:
" +
"" +
"- Transformed to a relative URL of the current location if it starts with . or .. or ...;
" +
"... is special and moves up the directory hierarchy as far as possible." +
@@ -581,7 +581,7 @@ function Commands() //{{{
"will open the wikipedia entry for linux torvalds). " +
" - Opened with the default search engine or keyword (specified with the
'defsearch' option) " +
"if the first word is no search engine (:open linus torvalds will open a google search for linux torvalds). " +
- " - Passed directly to Firefox in all other cases (
:open www.osnews.com | www.slashdot.org will " +
+ " - Passed directly to Firefox in all other cases (
:open www.osnews.com, www.slashdot.org will " +
"open OSNews in the current, and Slashdot in a new background tab). " +
"
" +
"You WILL be able to use :open [-T \"linux\"] torvalds<Tab> to complete bookmarks " +
@@ -1088,7 +1088,7 @@ function openURLsInNewTab(str, activate)
*/
function stringToURLs(str)
{
- var urls = str.split(/\s*\|\s*/);
+ var urls = str.split(/\s*\,\s+/);
begin: for (var url = 0; url < urls.length; url++)
{
// check for ./ and ../ (or even .../) to go to a file in the upper directory
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 17feb424..73205821 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -466,6 +466,7 @@ function Events() //{{{
// return false;
// vimperator.logObject(event);
var key = event.toString()
+// alert(key);
if (!key)
return false;
// event.stopPropagation();
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 10fe0551..e4744312 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -108,6 +108,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
+