xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename -allow-override switch to -override

Browse Source 
Closes #2057
This commit is contained in:
Maxime Coste 2018-05-19 10:54:24 +10:00
parent 592ab71048
commit 14d12fac04
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/pages/commands.asciidoc
View File

@ -304,7 +304,7 @@ New commands can be defined using the *define-command* command:
- *kak_token_to_complete*:::: - *kak_token_to_complete*::::
Index of the token being completed in the command line. Index of the token being completed in the command line.
*-allow-override*::: *-override*:::
allow the new command to replace an existing one with the same name allow the new command to replace an existing one with the same name
*-hidden*::: *-hidden*:::

4
src/commands.cc
View File

@ -860,7 +860,7 @@ void define_command(const ParametersParser& parser, Context& context, const Shel
if (not all_of(cmd_name, is_identifier)) if (not all_of(cmd_name, is_identifier))
throw runtime_error(format("invalid command name: '{}'", cmd_name)); throw runtime_error(format("invalid command name: '{}'", cmd_name));
if (cm.command_defined(cmd_name) and not parser.get_switch("allow-override")) if (cm.command_defined(cmd_name) and not parser.get_switch("override"))
throw runtime_error(format("command '{}' already defined", cmd_name)); throw runtime_error(format("command '{}' already defined", cmd_name));
CommandFlags flags = CommandFlags::None; CommandFlags flags = CommandFlags::None;
@ -1033,7 +1033,7 @@ const CommandDesc define_command_cmd = {
ParameterDesc{ ParameterDesc{
{ { "params", { true, "take parameters, accessible to each shell escape as $0..$N\n" { { "params", { true, "take parameters, accessible to each shell escape as $0..$N\n"
"parameter should take the form <count> or <min>..<max> (both omittable)" } }, "parameter should take the form <count> or <min>..<max> (both omittable)" } },
{ "allow-override", { false, "allow overriding an existing command" } }, { "override", { false, "allow overriding an existing command" } },
{ "hidden", { false, "do not display the command in completion candidates" } }, { "hidden", { false, "do not display the command in completion candidates" } },
{ "docstring", { true, "define the documentation string for command" } }, { "docstring", { true, "define the documentation string for command" } },
{ "file-completion", { false, "complete parameters using filename completion" } }, { "file-completion", { false, "complete parameters using filename completion" } },

3
src/main.cc
View File

@ -51,7 +51,8 @@ static const char* startup_info =
" * rotate main selection moved to ), rotate content to <a-)>, ( for backward\n" " * rotate main selection moved to ), rotate content to <a-)>, ( for backward\n"
" * faces are now scoped, set-face command takes an additional scope parameter\n" " * faces are now scoped, set-face command takes an additional scope parameter\n"
" * <backtab> key is gone, use <s-tab> instead\n" " * <backtab> key is gone, use <s-tab> instead\n"
" === Kakoune v2018.04.13 Released ===\n"; " === Kakoune v2018.04.13 Released ===\n"
" * define-command -allow-override switch has been renamed -override\n";
struct startup_error : runtime_error struct startup_error : runtime_error
{ {