[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs bufed.c clang.c dired.c extras.c hex.c h...
|
From: |
Charlie Gordon |
|
Subject: |
[Qemacs-commit] qemacs bufed.c clang.c dired.c extras.c hex.c h... |
|
Date: |
Fri, 25 Apr 2008 10:47:00 +0000 |
CVSROOT: /cvsroot/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 08/04/25 10:47:00
Modified files:
. : bufed.c clang.c dired.c extras.c hex.c html.c
image.c latex-mode.c qe.h qeconfig.h shell.c
variables.c
plugin-example : my_plugin.c
Log message:
renamed CMD_ and CMDV to CMD2 and CMD3 for consistency
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/bufed.c?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/qemacs/extras.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/image.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/qemacs/qeconfig.h?cvsroot=qemacs&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/qemacs/variables.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/plugin-example/my_plugin.c?cvsroot=qemacs&r1=1.4&r2=1.5
Patches:
Index: bufed.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/bufed.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- bufed.c 30 Mar 2008 16:10:15 -0000 1.18
+++ bufed.c 25 Apr 2008 10:46:58 -0000 1.19
@@ -291,7 +291,7 @@
};
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,
};
Index: clang.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/clang.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- clang.c 20 Apr 2008 14:14:42 -0000 1.38
+++ clang.c 25 Apr 2008 10:46:58 -0000 1.39
@@ -630,16 +630,16 @@
/* 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,
};
Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- dired.c 22 Apr 2008 08:15:04 -0000 1.28
+++ dired.c 25 Apr 2008 10:46:58 -0000 1.29
@@ -578,7 +578,7 @@
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 */
Index: extras.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/extras.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- extras.c 22 Apr 2008 09:28:33 -0000 1.6
+++ extras.c 25 Apr 2008 10:46:59 -0000 1.7
@@ -379,37 +379,37 @@
}
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")
Index: hex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/hex.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- hex.c 22 Apr 2008 09:15:00 -0000 1.28
+++ hex.c 25 Apr 2008 10:46:59 -0000 1.29
@@ -143,10 +143,10 @@
"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")
Index: html.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- html.c 23 Apr 2008 17:05:51 -0000 1.20
+++ html.c 25 Apr 2008 10:46:59 -0000 1.21
@@ -864,11 +864,11 @@
/* 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,
};
Index: image.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/image.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- image.c 15 Apr 2008 23:24:03 -0000 1.20
+++ image.c 25 Apr 2008 10:46:59 -0000 1.21
@@ -801,10 +801,10 @@
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 @@
"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: }")
Index: latex-mode.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- latex-mode.c 22 Apr 2008 08:11:56 -0000 1.29
+++ latex-mode.c 25 Apr 2008 10:46:59 -0000 1.30
@@ -314,10 +314,10 @@
/* 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,
Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- qe.h 23 Apr 2008 15:32:26 -0000 1.91
+++ qe.h 25 Apr 2008 10:46:59 -0000 1.92
@@ -1293,9 +1293,9 @@
} 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 */
Index: qeconfig.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qeconfig.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- qeconfig.h 22 Apr 2008 09:28:33 -0000 1.34
+++ qeconfig.h 25 Apr 2008 10:46:59 -0000 1.35
@@ -26,10 +26,10 @@
/*---------------- 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 @@
"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 @@
"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 @@
"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 @@
"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 @@
"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 @@
/*---------------- 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 @@
"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 @@
"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 @@
"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,
};
Index: shell.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/shell.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- shell.c 20 Apr 2008 11:56:25 -0000 1.61
+++ shell.c 25 Apr 2008 10:46:59 -0000 1.62
@@ -1688,9 +1688,9 @@
"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 @@
/* 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,
Index: variables.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/variables.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- variables.c 15 Apr 2008 23:24:04 -0000 1.5
+++ variables.c 25 Apr 2008 10:46:59 -0000 1.6
@@ -308,10 +308,10 @@
/*---------------- 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,
Index: plugin-example/my_plugin.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/plugin-example/my_plugin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- plugin-example/my_plugin.c 4 Jan 2008 23:04:12 -0000 1.4
+++ plugin-example/my_plugin.c 25 Apr 2008 10:46:59 -0000 1.5
@@ -15,7 +15,7 @@
}
static CmdDef my_commands[] = {
- CMD_( KEY_CTRLX('h'), KEY_NONE,
+ CMD2( KEY_CTRLX('h'), KEY_NONE,
"insert-hello", insert_hello, ES, "*")
CMD_DEF_END,
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs bufed.c clang.c dired.c extras.c hex.c h...,
Charlie Gordon <=