gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 17:14:12 +01:00
Code Issues Projects Releases Wiki Activity

Improve :delmacros error messages.

Browse Source
This commit is contained in:
Doug Kearns
2009-05-21 00:12:36 +10:00
parent 111e27bf2e
commit 4c4295029e
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/content/events.js
View File

@@ -732,15 +732,22 @@ function Events() //{{{
"Delete macros",
function (args)
{
if (args.bang)
args.string = ".*"; // XXX
if (args.bang && args.string)
{
liberator.echoerr("E474: Invalid argument");
return;
}
events.deleteMacros(args.string);
if (args.bang)
events.deleteMacros();
else if (args.string)
events.deleteMacros(args.string);
else
liberator.echoerr("E471: Argument required");
},
{
bang: true,
completer: function (context) completion.macro(context),
literal: 0
completer: function (context) completion.macro(context)
});
commands.add(["macros"],
@@ -884,7 +891,8 @@ function Events() //{{{
/**
* Returns all macros matching <b>filter</b>.
*
* @param {string} filter A regular expression filter.
* @param {string} filter A regular expression filter string. A null
* filter selects all macros.
*/
getMacros: function (filter)
{
@@ -898,7 +906,8 @@ function Events() //{{{
/**
* Deletes all macros matching <b>filter</b>.
*
* @param {string} filter A regular expression filter.
* @param {string} filter A regular expression filter string. A null
* filter deletes all macros.
*/
deleteMacros: function (filter)
{
@@ -906,7 +915,7 @@ function Events() //{{{
for (let [item,] in macros)
{
if (re.test(item))
if (re.test(item) || !filter)
macros.remove(item);
}
},