From 0d81e135339a90c86654b12f2a2136e7ac3e9d73 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 13 Aug 2007 18:12:40 +0000
Subject: [PATCH] hopefully made the MOW hack better, so that it doesn't show
 during startup fixed wildoptions=sort

---
 ChangeLog                                | 54 ++++++++++++++++++++++++
 chrome/content/vimperator/mappings.js    |  2 +-
 chrome/content/vimperator/ui.js          | 12 ++++--
 chrome/content/vimperator/vimperator.xul |  2 +-
 4 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01ef36e5..6a9f62ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2007-08-13 11:29  dougkearns
+
+	* chrome/content/vimperator/vimperator.js: fix plugin directory
+	  sourcing so it works on Windows - don't attempt to open the
+	  directory as an input stream
+
+2007-08-12 18:39  dougkearns
+
+	* chrome/content/vimperator/: commands.js, vimperator.js: expand
+	  environment variables in the filename argument to :source
+
+2007-08-12 15:20  dougkearns
+
+	* chrome/content/vimperator/mappings.js: don't echo text after
+	  copying it to the clipboard with "Y"
+
+2007-08-12 12:30  dougkearns
+
+	* chrome/content/vimperator/buffers.js: display an informational
+	  message when the text zoom value is changed
+
+2007-08-12 08:48  dougkearns
+
+	* NEWS, chrome/content/vimperator/commands.js,
+	  chrome/content/vimperator/ui.js: add initial implementation of
+	  :normal command
+
+2007-08-12 02:03  stubenschrott
+
+	* NEWS, chrome/content/vimperator/events.js,
+	  chrome/content/vimperator/ui.js,
+	  chrome/content/vimperator/vimperator.js,
+	  chrome/content/vimperator/vimperator.xul: commandline and MIW try
+	  to keep focus now changed commandline handling in general
+	  autosize MIW on new content new handling should be more robust,
+	  but there may be bugs, please report
+
+2007-08-11 22:05  stubenschrott
+
+	* chrome/content/vimperator/: events.js, ui.js: fixed/renamed
+	  vimperator.events.toString(event); v.e.is{Accept,Cancel}Key(key)
+	  helper functions
+
+2007-08-11 21:20  stubenschrott
+
+	* chrome/content/vimperator/: events.js, vimperator.xul: added
+	  <space>-support for feedkeys() moved
+	  KeyboardEvent.prototype.toString() ->
+	  vimperator.events.eventToString()
+
+2007-08-11 19:08  stubenschrott
+
+	* ChangeLog, NEWS: changelog->NEWS, ChangeLog autogenerated now
+
 2007-08-11 18:26  dougkearns
 
 	* chrome/content/vimperator/commands.js: only allow :source to
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index b8b0fcf2..55d4018d 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -234,7 +234,7 @@ function Mappings() //{{{
     // TODO: move default maps to their own v.normal namespace
     this.getDefaultMap = function(mode, cmd)
     {
-            return getMap(mode, cmd, main);
+        return getMap(mode, cmd, main);
     }
 
     // returns an array of mappings with names which start with "cmd"
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 0a260182..36459f99 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -66,8 +66,11 @@ function CommandLine() //{{{
     multiline_output_widget.contentDocument.body.setAttribute("style", "margin: 0px; font-family: -moz-fixed;"); // get rid of the default border
     multiline_output_widget.contentDocument.body.innerHTML = "";
     // we need this hack, or otherwise the first use of setMultiline() will have a wrong height
-    multiline_output_widget.collapsed = false;
-    setTimeout(function() { multiline_output_widget.collapsed = true; }, 0);
+    setTimeout(function() {
+        multiline_output_widget.collapsed = false;
+        var content_height = multiline_output_widget.contentDocument.height;
+        multiline_output_widget.collapsed = true;
+    }, 100);
 
     // The widget used for multiline intput
     var multiline_input_widget = document.getElementById("vimperator-multiline-input");
@@ -149,7 +152,8 @@ function CommandLine() //{{{
         // vimperator.log(content_height);
         var height = content_height < available_height ? content_height : available_height;
 
-        multiline_output_widget.style.height = height + "px";
+        //multiline_output_widget.style.height = height + "px";
+        multiline_output_widget.height = height + "px";
         multiline_output_widget.collapsed = false;
         setTimeout(function() {
             multiline_output_widget.focus();
@@ -414,7 +418,7 @@ function CommandLine() //{{{
                         [completion_start_index, completions] = res;
 
                     // Sort the completion list
-                    if (vimperator.options["wildoptions"].search(/\bsort\b/))
+                    if (vimperator.options["wildoptions"].search(/\bsort\b/) > -1)
                     {
                         completions.sort(function(a, b) {
                                 if (a[0] < b[0])
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 2d6be2ad..3f5233c7 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -101,7 +101,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                         onblur="vimperator.commandline.onEvent(event);"/>
                 </hbox>
 
-                <iframe  id="vimperator-multiline-output" src="about:blank" flex="1" hidden="false" collapsed="true"
+                <iframe  id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
                         onkeypress="vimperator.commandline.onMultilineOutputEvent(event)"/>
 
                 <textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"