Merge pull request #292 from stemar94/delmacros

Make delmacros match delqmarks

Author: maxauthority

common/content/events.js

@@ -241,16 +241,17 @@ const Events = Module("events", {
     },
 
     /**
-     * Deletes all macros matching <b>filter</b>.
+     * Deletes the specified macros. The <b>filter</b> is a list of
+     * macros and ranges are supported. Eg. "ab c d e-k".
+     *
+     * @param {string} filter The list of macros to delete.
      *
-     * @param {string} filter A regular expression filter string. A null
-     *     filter deletes all macros.
      */
     deleteMacros: function (filter) {
-        let re = RegExp(filter);
+        let re = RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
         for (let [item, ] in this._macros) {
-            if (re.test(item) || !filter)
+            if (re.test(item))
                 this._macros.remove(item);
         }
     },

common/locale/en-US/repeat.xml

@@ -70,10 +70,15 @@
     <spec>:delmac<oa>ros</oa> <a>args</a></spec>
     <spec>:delmac<oa>ros</oa>!</spec>
     <description>
-        <p>
-            Delete recorded macros matching the regular expression <a>args</a>. If <oa>!</oa> is given
-            all macros are deleted.
-        </p>
+        <p>Delete the specified macros. Macros are presented as a list.</p>
+
+        <p>Examples:</p>
+
+        <ul>
+            <li><ex>:delmacros Aa b p</ex> deletes macros A, a, b and p</li>
+            <li><ex>:delmacros b-p</ex> deletes all macros in the range b to p</li>
+            <li><ex>:delmacros!</ex> deletes all macros</li>
+        </ul>
     </description>
 </item>
 

vimperator/NEWS

@@ -1,4 +1,5 @@
 201x-xx-xx:
+    * :delmacro matches the syntax and behaviour of :delqmark, e.g. allowing ranges as argument
     * Stop propagation for keyboard event if that key are contained in -except option on :ignorekeys
     * Improvements in handling Esc for unfocusing text fields
     * Closing the last tab of a window now respects the Firefox setting: