From caf6950145e46d4eefe06a466907e14ccdf0b099 Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Fri, 25 Apr 2008 10:46:58 +0000 Subject: [PATCH] renamed CMD_ and CMDV to CMD2 and CMD3 for consistency --- bufed.c | 2 +- clang.c | 10 +-- dired.c | 2 +- extras.c | 24 +++---- hex.c | 4 +- html.c | 6 +- image.c | 6 +- latex-mode.c | 4 +- plugin-example/my_plugin.c | 2 +- qe.h | 4 +- qeconfig.h | 126 ++++++++++++++++++------------------- shell.c | 12 ++-- variables.c | 4 +- 13 files changed, 103 insertions(+), 103 deletions(-) diff --git a/bufed.c b/bufed.c index e58b4c2..f864771 100644 --- a/bufed.c +++ b/bufed.c @@ -291,7 +291,7 @@ static CmdDef bufed_commands[] = { }; static CmdDef bufed_global_commands[] = { - CMD_( KEY_CTRLX(KEY_CTRL('b')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('b')), KEY_NONE, "list-buffers", do_list_buffers, ESi, "ui") CMD_DEF_END, }; diff --git a/clang.c b/clang.c index 03074f8..48c1adf 100644 --- a/clang.c +++ b/clang.c @@ -630,16 +630,16 @@ static int c_mode_init(EditState *s, ModeSavedData *saved_data) /* C mode specific commands */ static CmdDef c_commands[] = { - CMD_( KEY_CTRL('i'), KEY_NONE, + CMD2( KEY_CTRL('i'), KEY_NONE, "c-indent-command", do_c_indent, ES, "*") - CMD_( KEY_META(KEY_CTRL('\\')), KEY_NONE, + CMD2( KEY_META(KEY_CTRL('\\')), KEY_NONE, "c-indent-region", do_c_indent_region, ES, "*") /* should map to KEY_META + KEY_CTRL_LEFT ? */ - CMDV( KEY_META('['), KEY_NONE, + CMD3( KEY_META('['), KEY_NONE, "c-backward-preprocessor", do_c_forward_preprocessor, ESi, -1, "*v") - CMDV( KEY_META(']'), KEY_NONE, + CMD3( KEY_META(']'), KEY_NONE, "c-forward-preprocessor", do_c_forward_preprocessor, ESi, 1, "*v") - CMD_( '{', '}', + CMD2( '{', '}', "c-electric-key", do_c_electric, ESi, "*ki") CMD_DEF_END, }; diff --git a/dired.c b/dired.c index ba1101a..f30a577 100644 --- a/dired.c +++ b/dired.c @@ -578,7 +578,7 @@ static CmdDef dired_commands[] = { CMD0( ' ', KEY_CTRL('t'), "dired-toggle_selection", list_toggle_selection) /* BS should go back to previous item and unmark it */ - CMD_( 's', KEY_NONE, + CMD2( 's', KEY_NONE, "dired-sort", dired_sort, ESs, "s{Sort order: }") /* s -> should also change switches */ diff --git a/extras.c b/extras.c index 1d50433..8a2afdd 100644 --- a/extras.c +++ b/extras.c @@ -379,37 +379,37 @@ static void do_unset_key(EditState *s, const char *keystr, int local) } static CmdDef extra_commands[] = { - CMD_( KEY_META('='), KEY_NONE, + CMD2( KEY_META('='), KEY_NONE, "compare-windows", do_compare_windows, ESi, "ui" ) - CMD_( KEY_META('\\'), KEY_NONE, + CMD2( KEY_META('\\'), KEY_NONE, "delete-horizontal-space", do_delete_horizontal_space, ES, "*") - CMD_( KEY_CTRLX('t'), KEY_NONE, + CMD2( KEY_CTRLX('t'), KEY_NONE, "show-date-and-time", do_show_date_and_time, ESi, "ui") /* Should map to KEY_META + KEY_CTRL_LEFT */ - CMDV( KEY_META(KEY_CTRL('b')), KEY_NONE, + CMD3( KEY_META(KEY_CTRL('b')), KEY_NONE, "backward-block", do_forward_block, ESi, -1, "v") /* Should map to KEY_META + KEY_CTRL_RIGHT */ - CMDV( KEY_META(KEY_CTRL('f')), KEY_NONE, + CMD3( KEY_META(KEY_CTRL('f')), KEY_NONE, "forward-block", do_forward_block, ESi, 1, "v") - CMDV( KEY_ESC, KEY_DELETE, + CMD3( KEY_ESC, KEY_DELETE, "backward-kill-block", do_kill_block, ESi, -1, "*v") - CMDV( KEY_META(KEY_CTRL('k')), KEY_NONE, + CMD3( KEY_META(KEY_CTRL('k')), KEY_NONE, "kill-block", do_kill_block, ESi, 1, "*v") /* Should also have mark-block on C-M-@ */ - CMDV( KEY_CTRL('t'), KEY_NONE, + CMD3( KEY_CTRL('t'), KEY_NONE, "transpose-chars", do_transpose, ESi, CMD_TRANSPOSE_CHARS, "*v") - CMDV( KEY_CTRLX(KEY_CTRL('t')), KEY_NONE, + CMD3( KEY_CTRLX(KEY_CTRL('t')), KEY_NONE, "transpose-lines", do_transpose, ESi, CMD_TRANSPOSE_LINES, "*v") - CMDV( KEY_META('t'), KEY_NONE, + CMD3( KEY_META('t'), KEY_NONE, "transpose-words", do_transpose, ESi, CMD_TRANSPOSE_WORDS, "*v") - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "global-unset-key", do_unset_key, ESsi, 0, "s{Unset key globally: }[key]" "v") - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "local-unset-key", do_unset_key, ESsi, 1, "s{Unset key locally: }[key]" "v") diff --git a/hex.c b/hex.c index f77a191..7e89359 100644 --- a/hex.c +++ b/hex.c @@ -143,10 +143,10 @@ static CmdDef hex_commands[] = { "decrease-width", do_incr_width, -1) CMD1( KEY_CTRL_RIGHT, KEY_NONE, "increase-width", do_incr_width, 1) - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-width", do_set_width, ESi, "ui{Width: }") - CMDV( KEY_META('g'), KEY_NONE, + CMD3( KEY_META('g'), KEY_NONE, "goto-byte", do_goto, ESsi, 'b', "us{Goto byte: }" "v") diff --git a/html.c b/html.c index 732e193..23cc61d 100644 --- a/html.c +++ b/html.c @@ -864,11 +864,11 @@ static void do_html_electric(EditState *s, int key) /* specific html commands */ static CmdDef html_commands[] = { /* should use 'k' intrinsic argument */ - CMDV( '<', KEY_NONE, + CMD3( '<', KEY_NONE, "html-electric-lt", do_html_electric, ESi, '<', "*v") - CMDV( '>', KEY_NONE, + CMD3( '>', KEY_NONE, "html-electric-gt", do_html_electric, ESi, '>', "*v") - CMDV( '&', KEY_NONE, + CMD3( '&', KEY_NONE, "html-electric-amp", do_html_electric, ESi, '&', "*v") CMD_DEF_END, }; diff --git a/image.c b/image.c index 094229b..481dc49 100644 --- a/image.c +++ b/image.c @@ -801,10 +801,10 @@ static void pixel_format_completion(CompleteState *cp) static CmdDef image_commands[] = { CMD0( 't', KEY_NONE, "image-rotate", image_rotate) - CMD_( 'c', KEY_NONE, + CMD2( 'c', KEY_NONE, "image-convert", image_convert, ESs, "s{New pixel format: }[pixel_format]|pixel_format|") - CMD_( 'b', KEY_NONE, + CMD2( 'b', KEY_NONE, "image-set-background-color", image_set_background_color, ESs, "s{Background color (use 'transparent' for tiling): }") #if 1 @@ -818,7 +818,7 @@ static CmdDef image_commands[] = { "image-larger-10", image_mult_size, 10) CMD1( ',', KEY_NONE, "image-smaller-10", image_mult_size, -10) - CMD_( 'S', KEY_NONE, + CMD2( 'S', KEY_NONE, "image-set-display-size", image_set_size, ESii, "i{Displayed width: }" "i{Displayed height: }") diff --git a/latex-mode.c b/latex-mode.c index 004f867..942f0ed 100644 --- a/latex-mode.c +++ b/latex-mode.c @@ -314,10 +314,10 @@ static void do_latex(EditState *e, const char *cmd) /* specific LaTeX commands */ static CmdDef latex_commands[] = { - CMD_( '\"', KEY_NONE, + CMD2( '\"', KEY_NONE, "tex-insert-quote", do_tex_insert_quote, ES, "*") /* this should actually be KEY_CTRLC(KEY_CTRL('c')), ie C-c C-c */ - CMD_( KEY_CTRL('c'), KEY_NONE, + CMD2( KEY_CTRL('c'), KEY_NONE, "TeX-command-master", do_latex, ESs, "s{Command: (default LaTeX) }[latex]|latex|") CMD_DEF_END, diff --git a/plugin-example/my_plugin.c b/plugin-example/my_plugin.c index f4efab2..fbb23c8 100644 --- a/plugin-example/my_plugin.c +++ b/plugin-example/my_plugin.c @@ -15,7 +15,7 @@ static void insert_hello(EditState *s) } static CmdDef my_commands[] = { - CMD_( KEY_CTRLX('h'), KEY_NONE, + CMD2( KEY_CTRLX('h'), KEY_NONE, "insert-hello", insert_hello, ES, "*") CMD_DEF_END, }; diff --git a/qe.h b/qe.h index dbda164..7a73b60 100644 --- a/qe.h +++ b/qe.h @@ -1293,9 +1293,9 @@ typedef struct CmdDef { } CmdDef; /* new command macros */ -#define CMD_(key, key_alt, name, func, sig, args) \ +#define CMD2(key, key_alt, name, func, sig, args) \ { key, key_alt, name "\0" args, { .sig = func }, CMD_ ## sig, 0 }, -#define CMDV(key, key_alt, name, func, sig, val, args) \ +#define CMD3(key, key_alt, name, func, sig, val, args) \ { key, key_alt, name "\0" args, { .sig = func }, CMD_ ## sig, val }, /* old macros for compatibility */ diff --git a/qeconfig.h b/qeconfig.h index 23f93c5..396f929 100644 --- a/qeconfig.h +++ b/qeconfig.h @@ -26,10 +26,10 @@ static CmdDef basic_commands[] = { /*---------------- Simple commands ----------------*/ - CMD_( KEY_DEFAULT, KEY_NONE, + CMD2( KEY_DEFAULT, KEY_NONE, "self-insert-command", do_char, ESii, "*" "kiui") - CMD_( KEY_META('#'), KEY_NONE, + CMD2( KEY_META('#'), KEY_NONE, "insert-char", do_char, ESii, "*" "i{Insert char: }" "ui") CMD1( KEY_CTRL('p'), KEY_UP, @@ -60,23 +60,23 @@ static CmdDef basic_commands[] = { "overwrite-mode", do_insert) /* deletion commands should be allowed in read only buffers, * they should merely copy the data to the kill ring */ - CMD_( KEY_CTRL('d'), KEY_DELETE, + CMD2( KEY_CTRL('d'), KEY_DELETE, "delete-char", do_delete_char, ESi, "*ui") - CMD_( 127, KEY_NONE, + CMD2( 127, KEY_NONE, "backward-delete-char", do_backspace, ESi, "*ui") CMD0( KEY_META('<'), KEY_CTRL_HOME, "beginning-of-buffer", do_bof ) CMD0( KEY_META('>'), KEY_CTRL_END, "end-of-buffer", do_eof ) /* do_tab will not change read only buffer */ - CMD_( KEY_CTRL('i'), KEY_NONE, + CMD2( KEY_CTRL('i'), KEY_NONE, "tabulate", do_tab, ESi, "ui") - //CMD_( KEY_SPC, KEY_NONE, "space", do_space, "*ui") - CMD_( KEY_CTRL('q'), KEY_NONE, + //CMD2( KEY_SPC, KEY_NONE, "space", do_space, "*ui") + CMD2( KEY_CTRL('q'), KEY_NONE, "quoted-insert", do_quote, ESi, "*ui") - CMDV( KEY_CTRL('j'), KEY_RET, + CMD3( KEY_CTRL('j'), KEY_RET, "newline", do_return, ESi, 1, "*v") - CMDV( KEY_CTRL('o'), KEY_NONE, + CMD3( KEY_CTRL('o'), KEY_NONE, "open-line", do_return, ESi, 0, "*v") /*---------------- Region handling / Kill commands ----------------*/ @@ -89,67 +89,67 @@ static CmdDef basic_commands[] = { "mark-whole-buffer", do_mark_whole_buffer) CMD0( KEY_META(KEY_CTRL('w')), KEY_NONE, "append-next-kill", do_append_next_kill) - CMDV( KEY_CTRL('k'), KEY_NONE, + CMD3( KEY_CTRL('k'), KEY_NONE, "kill-line", do_kill_line, ESi, 1, "*v" ) - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "kill-beginning-of-line", do_kill_line, ESi, -1, "*v" ) - CMDV( KEY_META(KEY_DEL), KEY_META(KEY_BS), + CMD3( KEY_META(KEY_DEL), KEY_META(KEY_BS), "backward-kill-word", do_kill_word, ESi, -1, "*v" ) - CMDV( KEY_META('d'), KEY_NONE, + CMD3( KEY_META('d'), KEY_NONE, "kill-word", do_kill_word, ESi, 1, "*v" ) - CMDV( KEY_CTRL('w'), KEY_NONE, + CMD3( KEY_CTRL('w'), KEY_NONE, "kill-region", do_kill_region, ESi, 1, "*v" ) CMD1( KEY_META('w'), KEY_NONE, "copy-region", do_kill_region, 0 ) - CMD_( KEY_CTRL('y'), KEY_NONE, + CMD2( KEY_CTRL('y'), KEY_NONE, "yank", do_yank, ES, "*") - CMD_( KEY_META('y'), KEY_NONE, + CMD2( KEY_META('y'), KEY_NONE, "yank-pop", do_yank_pop, ES, "*") /*---------------- Buffer and file handling ----------------*/ - CMD_( KEY_CTRLX(KEY_CTRL('f')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('f')), KEY_NONE, "find-file", do_find_file, ESs, "s{Find file: }[file]|file|") /* u? */ - CMD_( KEY_CTRL('x'), KEY_META('f'), + CMD2( KEY_CTRL('x'), KEY_META('f'), "find-file-other-window", do_find_file_other_window, ESs, "s{Find file: }[file]|file|") /* u? */ - CMD_( KEY_CTRLX(KEY_CTRL('v')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('v')), KEY_NONE, "find-alternate-file", do_find_alternate_file, ESs, "s{Find alternate file: }[file]|file|") /* u? */ - CMD_( KEY_CTRLX('i'), KEY_NONE, + CMD2( KEY_CTRLX('i'), KEY_NONE, "insert-file", do_insert_file, ESs, "*s{Insert file: }[file]|file|") /* u? */ CMD0( KEY_CTRLX(KEY_CTRL('s')), KEY_NONE, "save-buffer", do_save_buffer) /* u? */ - CMD_( KEY_CTRLX(KEY_CTRL('w')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('w')), KEY_NONE, "write-file", do_write_file, ESs, "s{Write file: }[file]|file|") /* u? */ - CMD_( KEY_CTRLX('w'), KEY_NONE, + CMD2( KEY_CTRLX('w'), KEY_NONE, "write-region", do_write_region, ESs, "s{Write region to file: }[file]|file|") /* u? */ - CMD_( KEY_CTRLX('b'), KEY_NONE, + CMD2( KEY_CTRLX('b'), KEY_NONE, "switch-to-buffer", do_switch_to_buffer, ESs, "s{Switch to buffer: }[buffer]|buffer|") - CMD_( KEY_CTRLX('k'), KEY_NONE, + CMD2( KEY_CTRLX('k'), KEY_NONE, "kill-buffer", do_kill_buffer, ESs, "s{Kill buffer: }[buffer]|buffer|") CMD0( KEY_CTRLX(KEY_CTRL('q')), KEY_NONE, "toggle-read-only", do_toggle_read_only) - CMD_( KEY_META('~'), KEY_NONE, + CMD2( KEY_META('~'), KEY_NONE, "not-modified", do_not_modified, ESi, "ui") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-visited-file-name", do_set_visited_file_name, ESss, "s{Set visited file name: }[file]|file|" "s{Rename file? }") /*---------------- Search and replace ----------------*/ - CMDV( KEY_META('S'), KEY_NONE, + CMD3( KEY_META('S'), KEY_NONE, "search-forward", do_search_string, ESsi, 1, "s{Search forward: }|search|" "v") - CMDV( KEY_META('R'), KEY_NONE, + CMD3( KEY_META('R'), KEY_NONE, "search-backward", do_search_string, ESsi, -1, "s{Search backward: }|search|" "v") @@ -158,12 +158,12 @@ static CmdDef basic_commands[] = { "isearch-backward", do_isearch, -1 ) CMD1( KEY_CTRL('s'), KEY_NONE, "isearch-forward", do_isearch, 1 ) - CMD_( KEY_META('%'), KEY_NONE, + CMD2( KEY_META('%'), KEY_NONE, "query-replace", do_query_replace, ESss, "*" "s{Query replace: }|search|" "s{With: }|replace|") /* passing argument restricts replace to word matches */ - CMD_( KEY_META('r'), KEY_NONE, + CMD2( KEY_META('r'), KEY_NONE, "replace-string", do_replace_string, ESssi, "*" "s{Replace String: }|search|" "s{With: }|replace|" @@ -175,27 +175,27 @@ static CmdDef basic_commands[] = { "backward-paragraph", do_backward_paragraph) CMD0( KEY_META('}'), KEY_NONE, "forward-paragraph", do_forward_paragraph) - CMD_( KEY_META('q'), KEY_NONE, + CMD2( KEY_META('q'), KEY_NONE, "fill-paragraph", do_fill_paragraph, ES, "*") - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "kill-paragraph", do_kill_paragraph, ESi, 1, "*v") - CMDV( KEY_META('c'), KEY_NONE, + CMD3( KEY_META('c'), KEY_NONE, "capitalize-word", do_changecase_word, ESi, 2, "*v") - CMDV( KEY_META('l'), KEY_NONE, + CMD3( KEY_META('l'), KEY_NONE, "downcase-word", do_changecase_word, ESi, -1, "*v") - CMDV( KEY_META('u'), KEY_NONE, + CMD3( KEY_META('u'), KEY_NONE, "upcase-word", do_changecase_word, ESi, 1, "*v") - CMDV( KEY_META(KEY_CTRL('c')), KEY_NONE, + CMD3( KEY_META(KEY_CTRL('c')), KEY_NONE, "capitalize-region", do_changecase_region, ESi, 2, "*v") - CMDV( KEY_CTRLX(KEY_CTRL('l')), KEY_NONE, + CMD3( KEY_CTRLX(KEY_CTRL('l')), KEY_NONE, "downcase-region", do_changecase_region, ESi, -1, "*v") - CMDV( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, + CMD3( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, "upcase-region", do_changecase_region, ESi, 1, "*v") /*---------------- Command handling ----------------*/ - CMD_( KEY_META('x'), KEY_NONE, + CMD2( KEY_META('x'), KEY_NONE, "execute-command", do_execute_command, ESsi, "s{Command: }[command]|command|" "ui") @@ -210,18 +210,18 @@ static CmdDef basic_commands[] = { "end-kbd-macro", do_end_macro) CMD0( KEY_CTRLX('e'), KEY_CTRL('\\'), "call-last-kbd-macro", do_call_macro) - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "define-kbd-macro", do_define_kbd_macro, ESsss, "s{Macro name: }[command]" "s{Macro keys: }" "s{Bind to key: }[key]") /* set/unset key? */ - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "global-set-key", do_set_key, ESssi, 0, "s{Set key globally: }[key]" "s{command: }[command]|command|" "v") - CMDV( KEY_NONE, KEY_NONE, + CMD3( KEY_NONE, KEY_NONE, "local-set-key", do_set_key, ESssi, 1, "s{Set key locally: }[key]" "s{command: }[command]|command|" @@ -272,42 +272,42 @@ static CmdDef basic_commands[] = { /*---------------- International ----------------*/ - CMD_( KEY_CTRLXRET('f'), KEY_NONE, + CMD2( KEY_CTRLXRET('f'), KEY_NONE, "set-buffer-file-coding-system", do_set_buffer_file_coding_system, ESs, "s{Charset: }[charset]") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "convert-buffer-file-coding-system", do_convert_buffer_file_coding_system, ESs, "*" "s{Charset: }[charset]") CMD0( KEY_CTRLXRET('b'), KEY_NONE, "toggle-bidir", do_toggle_bidir) - CMD_( KEY_CTRLXRET(KEY_CTRL('\\')), KEY_NONE, + CMD2( KEY_CTRLXRET(KEY_CTRL('\\')), KEY_NONE, "set-input-method", do_set_input_method, ESs, "s{Input method: }[input]") CMD0( KEY_CTRLX(KEY_CTRL('\\')), KEY_NONE, "switch-input-method", do_switch_input_method) /*---------------- Styles & display ----------------*/ - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "define-color", do_define_color, ESss, "s{Color name: }[color]|color|" "s{Color value: }[color]|color|") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-style", do_set_style, ESsss, "s{Style: }[style]|style|" "s{CSS Property Name: }[style-property]|style-property|" "s{CSS Property Value: }") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-display-size", do_set_display_size, ESii, "i{Width: }" "i{Height: }") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-system-font", do_set_system_font, ESss, "s{Font family: }" "s{System fonts: }") /*---------------- Miscellaneous ----------------*/ - CMD_( KEY_CTRLX(KEY_CTRL('c')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('c')), KEY_NONE, "exit-qemacs", do_exit_qemacs, ESi, "ui") CMD0( KEY_CTRL('l'), KEY_NONE, "refresh", do_refresh_complete) @@ -315,10 +315,10 @@ static CmdDef basic_commands[] = { "doctor", do_doctor) CMD0( KEY_CTRLX('u'), KEY_CTRL('_'), "undo", do_undo) - CMDV( KEY_META('g'), KEY_NONE, + CMD3( KEY_META('g'), KEY_NONE, "goto-line", do_goto, ESsi, 'l', "us{Goto line: }" "v") - CMDV( KEY_CTRLX('g'), KEY_NONE, + CMD3( KEY_CTRLX('g'), KEY_NONE, "goto-char", do_goto, ESsi, 'c', "us{Goto char: }" "v") CMD0( KEY_CTRLX('l'), KEY_NONE, @@ -335,37 +335,37 @@ static CmdDef basic_commands[] = { "word-wrap", do_word_wrap) CMD1( KEY_NONE, KEY_NONE, "toggle-control-h", do_toggle_control_h, 0) - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-emulation", do_set_emulation, ESs, "s{Emulation mode: }") CMD0( KEY_NONE, KEY_NONE, "set-trace", do_set_trace) - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "cd", do_cd, ESs, "s{Change default directory: }[file]|file|") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-mode", do_set_mode, ESs, "s{Set mode: }[mode]") /* tab & indent */ - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-tab-width", do_set_tab_width, ESi, "ui{Tab width: }") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-indent-width", do_set_indent_width, ESi, "ui{Indent width: }") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "set-indent-tabs-mode", do_set_indent_tabs_mode, ESi, "ui{Indent tabs mode (0 or 1): }") /* other stuff */ - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "load-file-from-path", do_load_file_from_path, ESs, "s{Load file from path: }|file|") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "load-config-file", do_load_config_file, ESs, "s{Configuration file: }[file]|file|") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "load-qerc", do_load_qerc, ESs, "s{path: }[file]|file|") @@ -388,9 +388,9 @@ CmdDef minibuffer_commands[] = { "previous-history-element", do_history, -1) CMD1( KEY_CTRL('n'), KEY_DOWN, "next-history-element", do_history, 1) - CMDV( '/', KEY_NONE, + CMD3( '/', KEY_NONE, "electric-slash", do_electric_filename, ESi, '/', "*v") - CMDV( '~', KEY_NONE, + CMD3( '~', KEY_NONE, "electric-tilde", do_electric_filename, ESi, '~', "*v") CMD_DEF_END, }; diff --git a/shell.c b/shell.c index 1bea2eb..5a6d15e 100644 --- a/shell.c +++ b/shell.c @@ -1688,9 +1688,9 @@ static CmdDef shell_commands[] = { "shell-delete-char", shell_write_char, 4) CMD1( KEY_META('d'), KEY_NONE, "shell-delete-word", shell_write_char, KEY_META('d')) - CMD_( KEY_META(KEY_DEL), KEY_META(KEY_BS) , + CMD2( KEY_META(KEY_DEL), KEY_META(KEY_BS) , "shell-backward-delete-word", shell_write_char, ESi, "*ki") - CMD_( KEY_META('p'), KEY_META('n'), + CMD2( KEY_META('p'), KEY_META('n'), "shell-history-search", shell_write_char, ESi, "*ki") CMD1( KEY_CTRL('i'), KEY_NONE, "shell-tabulate", shell_write_char, 9) @@ -1703,15 +1703,15 @@ static CmdDef shell_commands[] = { /* compilation commands */ static CmdDef compile_commands[] = { - CMD_( KEY_CTRLXRET('\r'), KEY_NONE, + CMD2( KEY_CTRLXRET('\r'), KEY_NONE, "shell", do_shell, ESi, "ui") - CMD_( KEY_CTRLX(KEY_CTRL('e')), KEY_NONE, + CMD2( KEY_CTRLX(KEY_CTRL('e')), KEY_NONE, "compile", do_compile, ESs, "s{Compile command: }|compile|") - CMD_( KEY_CTRLX('m'), KEY_NONE, + CMD2( KEY_CTRLX('m'), KEY_NONE, "make", do_compile, ESs, "S{make}") - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "man", do_man, ESs, "s{Show man page for: }|man|") CMD1( KEY_CTRLX(KEY_CTRL('p')), KEY_NONE, diff --git a/variables.c b/variables.c index ea5f5b1..30d1f2b 100644 --- a/variables.c +++ b/variables.c @@ -308,10 +308,10 @@ void qe_list_variables(EditState *s, EditBuffer *b) /*---------------- commands ----------------*/ static CmdDef var_commands[] = { - CMD_( KEY_NONE, KEY_NONE, + CMD2( KEY_NONE, KEY_NONE, "show-variable", do_show_variable, ESs, "s{Show variable: }[var]|var|") - CMD_( KEY_F8, KEY_NONE, + CMD2( KEY_F8, KEY_NONE, "set-variable", do_set_variable, ESss, "s{Set variable: }[var]|var|s{to value: }|value|") CMD_DEF_END,