new popups=4 option

AUTHORS

@@ -11,6 +11,7 @@ Inactive/former developers:
   * Viktor Kojouharov (Виктор Кожухаров)
  
 Patches (in no special order):
+  * Lukas Mai
   * Daniel Trstenjak (various things with hints)
   * M.Terada (suggest engines)
   * Muthu Kannan (ctrl-v support)

NEWS

@@ -1,4 +1,8 @@
 <pre>
+2008-05-14:
+    * version 1.1
+    * new popups=4 option
+
 2008-05-14:
     * version 1.0
     * THIS VERSION ONLY WORKS WITH FIREFOX 3.0 beta3 or newer

TODO

@@ -13,6 +13,7 @@ BUGS:
 - :sidebar improvements (:sidebar! Downloads while downloads is open should refocus the sidebar)
 - :sidebar History is broken
 - http://www.maximonline.com/jokes/ - the prev and next buttons on the image map are not hinted
+- ;f seems broken after a page load
 
 FEATURES:
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer

content/options.js

@@ -381,7 +381,7 @@ liberator.Options = function () //{{{
             }
 
             //                               1        2       3       4  5       6
-            var matches = args.match(/^\s*(no|inv)?([a-z]+)([?&!])?\s*(([+-^]?)=(.*))?\s*$/);
+            var matches = args.match(/^\s*(no|inv)?([a-z_]+)([?&!])?\s*(([+-^]?)=(.*))?\s*$/);
             if (!matches)
             {
                 liberator.echoerr("E518: Unknown option: " + args);

content/tabs.js

@@ -107,11 +107,12 @@ liberator.Tabs = function () //{{{
                 var values = [[0, 1], // always in current tab
                               [0, 3], // in a new tab
                               [2, 3], // in a new window if it has specified sizes
-                              [1, 2]];// always in new window
+                              [1, 2], // always in new window
+                              [2, 1]];// current tab unless it has specified sizes
                 liberator.options.setPref("browser.link.open_newwindow.restriction", values[value][0]);
                 liberator.options.setPref("browser.link.open_newwindow", values[value][1]);
             },
-            validator: function (value) { return (value >= 0 && value <= 3); }
+            validator: function (value) { return (value >= 0 && value <= 4); }
         });
 
     liberator.options.add(["showtabline", "stal"], 

locale/en-US/options.txt

@@ -415,6 +415,7 @@ they always open in a new tab. Possible values:
 *1*  Always open in a new tab
 *2*  Open in a new window if it has a specific requested size (default in Firefox)
 *3*  Always open in a new window
+*4*  Open in the same tab unless it has a specific requested size
 -----------------------------------------------------------------------------------------------------
 
 NOTE: This option does not change the popup blocker of Firefox in any way.