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

Replace :abc, :comc, :mapc with :unab!, :delc!, :unmap!. Add bang to :styt, :delsty, ...

Browse Source
This commit is contained in:
Kris Maglione
2011-02-11 16:06:19 -05:00
parent 35c70faa26
commit 7ca9b9cfea
4 changed files with 41 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/content/abbreviations.js
View File

@@ -296,25 +296,19 @@ var Abbreviations = Module("abbreviations", {
commands.add([ch + "una[bbreviate]"],
"Remove an abbreviation" + modeDescription,
function (args) {
let lhs = args.literalArg;
if (!lhs)
return dactyl.echoerr("E474: Invalid argument");
if (!args["-group"].remove(modes, lhs))
util.assert(args.bang ^ !!args[0], "Argument or ! required");
if (args.bang)
args["-group"].clear(modes);
else if (!args["-group"].remove(modes, lhs))
return dactyl.echoerr("E24: No such abbreviation");
}, {
argCount: "1",
argCount: "?",
bang: true,
completer: function (context) completion.abbreviation(context, modes, args["-group"]),
literal: 0,
options: [contexts.GroupFlag("abbrevs")]
});
commands.add([ch + "abc[lear]"],
"Remove all abbreviations" + modeDescription,
function (args) { args["-group"].clear(modes); },
{
argCount: "0",
options: [contexts.GroupFlag("abbrevs")]
});
}
addAbbreviationCommands([modes.INSERT, modes.COMMAND_LINE], "", "");

43
common/content/mappings.js
View File

@@ -575,50 +575,31 @@ var Mappings = Module("mappings", {
function (args) { map(args, true); },
opts);
commands.add([ch + "mapc[lear]"],
"Remove all mappings" + modeDescription,
function (args) {
util.assert(args["-group"].modifiable,
"Cannot change mappings in the builtin group");
let mapmodes = array.uniq(args["-modes"].map(findMode));
mapmodes.forEach(function (mode) {
args["-group"].clear(mode);
});
},
{
argCount: "0",
options: [
contexts.GroupFlag("mappings"),
update({}, modeFlag, {
names: ["-modes", "-mode", "-m"],
type: CommandOption.LIST,
description: "Remove all mappings from the given modes",
default: mapmodes || ["n", "v"]
})
]
});
commands.add([ch + "unm[ap]"],
"Remove a mapping" + modeDescription,
function (args) {
util.assert(args["-group"].modifiable,
"Cannot change mappings in the builtin group");
util.assert(args.bang ^ !!args[0], "Argument or ! required");
let mapmodes = array.uniq(args["-modes"].map(findMode));
let found = false;
for (let [, mode] in Iterator(mapmodes)) {
if (args["-group"].has(mode, args[0])) {
let found = 0;
for (let mode in values(mapmodes))
if (args.bang)
args["-group"].clear(mode);
else if (args["-group"].has(mode, args[0])) {
args["-group"].remove(mode, args[0]);
found = true;
found++;
}
}
if (!found)
if (!found && !args.bang)
dactyl.echoerr("E31: No such mapping");
},
{
argCount: "1",
argCount: "?",
bang: true,
completer: opts.completer,
options: [
contexts.GroupFlag("mappings"),