qemacs-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemacs-commit] qemacs bufed.c clang.c dired.c hex.c html.c ima...


From: Charlie Gordon
Subject: [Qemacs-commit] qemacs bufed.c clang.c dired.c hex.c html.c ima...
Date: Fri, 04 Jan 2008 23:04:12 +0000

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/01/04 23:04:12

Modified files:
        .              : bufed.c clang.c dired.c hex.c html.c image.c 
                         latex-mode.c qeconfig.h shell.c video.c 
        plugin-example : my_plugin.c 

Log message:
        cosmetics: reformated command definitions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/bufed.c?cvsroot=qemacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/image.c?cvsroot=qemacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/qemacs/qeconfig.h?cvsroot=qemacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/qemacs/video.c?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/plugin-example/my_plugin.c?cvsroot=qemacs&r1=1.3&r2=1.4

Patches:
Index: bufed.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/bufed.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- bufed.c     4 Jan 2008 22:24:37 -0000       1.13
+++ bufed.c     4 Jan 2008 23:04:11 -0000       1.14
@@ -263,19 +263,29 @@
 
 /* specific bufed commands */
 static CmdDef bufed_commands[] = {
-    CMD1( KEY_RET, KEY_RIGHT, "bufed-select", bufed_select, 0)
+    CMD1( KEY_RET, KEY_RIGHT,
+          "bufed-select", bufed_select, 0)
     /* bufed-abort should restore previous buffer in right-window */
-    CMD1( KEY_CTRL('g'), KEY_NONE, "bufed-abort", do_delete_window, 0)
-    CMD0( ' ', KEY_CTRL('t'), "bufed-toggle_selection", list_toggle_selection)
+    CMD1( KEY_CTRL('g'), KEY_NONE,
+          "bufed-abort", do_delete_window, 0)
+    CMD0( ' ', KEY_CTRL('t'),
+          "bufed-toggle_selection", list_toggle_selection)
     /* BS should go back to previous item and unmark it */
     //CMD1( 'u', KEY_NONE, "bufed-unmark", bufed_mark, ' ')
-    CMD0( '~', KEY_NONE, "bufed-clear-modified", bufed_clear_modified)
-    CMD0( '%', KEY_NONE, "bufed-toggle-read-only", bufed_toggle_read_only)
-    CMD1( 'a', KEY_NONE, "bufed-toggle-all-visible", bufed_refresh, 1)
-    CMD1( 'n', KEY_NONE, "next-line", do_up_down, 1 )
-    CMD1( 'p', KEY_NONE, "previous-line", do_up_down, -1 )
-    CMD1( 'r', 'g', "bufed-refresh", bufed_refresh, 0)
-    CMD0( 'k', KEY_F8, "bufed-kill-buffer", bufed_kill_buffer)
+    CMD0( '~', KEY_NONE,
+          "bufed-clear-modified", bufed_clear_modified)
+    CMD0( '%', KEY_NONE,
+          "bufed-toggle-read-only", bufed_toggle_read_only)
+    CMD1( 'a', KEY_NONE,
+          "bufed-toggle-all-visible", bufed_refresh, 1)
+    CMD1( 'n', KEY_NONE,
+          "next-line", do_up_down, 1)
+    CMD1( 'p', KEY_NONE,
+          "previous-line", do_up_down, -1)
+    CMD1( 'r', 'g',
+          "bufed-refresh", bufed_refresh, 0)
+    CMD0( 'k', KEY_F8,
+          "bufed-kill-buffer", bufed_kill_buffer)
     CMD_DEF_END,
 };
 

Index: clang.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/clang.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- clang.c     4 Jan 2008 22:24:38 -0000       1.25
+++ clang.c     4 Jan 2008 23:04:11 -0000       1.26
@@ -749,19 +749,24 @@
 
 /* C mode specific commands */
 static CmdDef c_commands[] = {
-    CMD_( KEY_CTRL('i'), KEY_NONE, "c-indent-command", do_c_indent, ES, "*")
-    CMD_( KEY_META(KEY_CTRL('\\')), KEY_NONE, "c-indent-region",
-          do_c_indent_region, ES, "*")
+    CMD_( KEY_CTRL('i'), KEY_NONE,
+          "c-indent-command", do_c_indent, ES, "*")
+    CMD_( 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,
           "c-backward-preprocessor", do_c_forward_preprocessor, ESi, -1, "*v")
     CMDV( KEY_META(']'), KEY_NONE,
           "c-forward-preprocessor", do_c_forward_preprocessor, ESi, 1, "*v")
     /* CG: should use 'k' intrinsic argument */
-    CMDV( ';', KEY_NONE, "c-electric-semi&comma", do_c_electric, ESi, ';', 
"*v")
-    CMDV( ':', KEY_NONE, "c-electric-colon", do_c_electric, ESi, ':', "*v")
-    CMDV( '{', KEY_NONE, "c-electric-obrace", do_c_electric, ESi, '{', "*v")
-    CMDV( '}', KEY_NONE, "c-electric-cbrace", do_c_electric, ESi, '}', "*v")
+    CMDV( ';', KEY_NONE,
+          "c-electric-semi&comma", do_c_electric, ESi, ';', "*v")
+    CMDV( ':', KEY_NONE,
+          "c-electric-colon", do_c_electric, ESi, ':', "*v")
+    CMDV( '{', KEY_NONE,
+          "c-electric-obrace", do_c_electric, ESi, '{', "*v")
+    CMDV( '}', KEY_NONE,
+          "c-electric-cbrace", do_c_electric, ESi, '}', "*v")
     CMD_DEF_END,
 };
 

Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- dired.c     4 Jan 2008 22:24:38 -0000       1.17
+++ dired.c     4 Jan 2008 23:04:11 -0000       1.18
@@ -539,25 +539,40 @@
 
 /* specific dired commands */
 static CmdDef dired_commands[] = {
-    CMD0( KEY_RET, KEY_RIGHT, "dired-select", dired_select)
-    CMD0( KEY_TAB, KEY_NONE, "dired-tab", do_other_window)
+    CMD0( KEY_RET, KEY_RIGHT,
+          "dired-select", dired_select)
+    CMD0( KEY_TAB, KEY_NONE,
+          "dired-tab", do_other_window)
     /* dired-abort should restore previous buffer in right-window */
-    CMD1( KEY_CTRL('g'), KEY_NONE, "dired-abort", do_delete_window, 0)
-    CMD0( ' ', KEY_CTRL('t'), "dired-toggle_selection", list_toggle_selection)
+    CMD1( KEY_CTRL('g'), KEY_NONE,
+          "dired-abort", do_delete_window, 0)
+    CMD0( ' ', KEY_CTRL('t'),
+          "dired-toggle_selection", list_toggle_selection)
     /* BS should go back to previous item and unmark it */
-    CMD_( 's', KEY_NONE, "dired-sort", dired_sort, ESs, "s{Sort order: }")
+    CMD_( 's', KEY_NONE,
+          "dired-sort", dired_sort, ESs,
+          "s{Sort order: }")
     /* s -> should also change switches */
-    CMD1( 'd', KEY_NONE, "dired-delete", dired_mark, 'D')
-    CMD1( 'c', KEY_NONE, "dired-copy", dired_mark, 'C')
-    CMD1( 'm', KEY_NONE, "dired-move", dired_mark, 'M')
-    CMD1( 'u', KEY_NONE, "dired-unmark", dired_mark, ' ')
-    CMD0( 'x', KEY_NONE, "dired-execute", dired_execute)
-    CMD1( 'n', KEY_NONE, "next-line", do_up_down, 1 )
-    CMD1( 'p', KEY_NONE, "previous-line", do_up_down, -1 )
-    CMD0( 'r', KEY_NONE, "dired-refresh", dired_refresh)
+    CMD1( 'd', KEY_NONE,
+          "dired-delete", dired_mark, 'D')
+    CMD1( 'c', KEY_NONE,
+          "dired-copy", dired_mark, 'C')
+    CMD1( 'm', KEY_NONE,
+          "dired-move", dired_mark, 'M')
+    CMD1( 'u', KEY_NONE,
+          "dired-unmark", dired_mark, ' ')
+    CMD0( 'x', KEY_NONE,
+          "dired-execute", dired_execute)
+    CMD1( 'n', KEY_NONE,
+          "next-line", do_up_down, 1)
+    CMD1( 'p', KEY_NONE,
+          "previous-line", do_up_down, -1)
+    CMD0( 'r', KEY_NONE,
+          "dired-refresh", dired_refresh)
     /* g -> refresh all expanded dirs ? */
     /* l -> relist single directory or marked files ? */
-    CMD0( '^', KEY_LEFT, "dired-parent", dired_parent)
+    CMD0( '^', KEY_LEFT,
+          "dired-parent", dired_parent)
     /* need commands for splitting, unsplitting, zooming, making subdirs */
     /* h -> info */
     /* i, + -> create subdirectory */
@@ -569,7 +584,8 @@
 };
 
 static CmdDef dired_global_commands[] = {
-    CMD0( KEY_CTRLX(KEY_CTRL('d')), KEY_NONE, "dired", do_dired)
+    CMD0( KEY_CTRLX(KEY_CTRL('d')), KEY_NONE,
+          "dired", do_dired)
     CMD_DEF_END,
 };
 

Index: hex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/hex.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- hex.c       4 Jan 2008 22:24:38 -0000       1.17
+++ hex.c       4 Jan 2008 23:04:11 -0000       1.18
@@ -121,11 +121,19 @@
 
 /* specific hex commands */
 static CmdDef hex_commands[] = {
-    CMD1( KEY_CTRL_LEFT, KEY_NONE, "decrease-width", do_incr_width, -1)
-    CMD1( KEY_CTRL_RIGHT, KEY_NONE, "increase-width", do_incr_width, 1)
-    CMD_( KEY_NONE, KEY_NONE, "set-width", do_set_width, ESi, "ui{Width: }")
-    CMDV( KEY_META('g'), KEY_NONE, "goto-byte", do_goto, ESsi, 'b', "us{Goto 
byte: }v")
-    CMD0( KEY_NONE, KEY_NONE, "toggle-hex", do_toggle_hex)
+    CMD1( KEY_CTRL_LEFT, KEY_NONE,
+          "decrease-width", do_incr_width, -1)
+    CMD1( KEY_CTRL_RIGHT, KEY_NONE,
+          "increase-width", do_incr_width, 1)
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-width", do_set_width, ESi,
+          "ui{Width: }")
+    CMDV( KEY_META('g'), KEY_NONE,
+          "goto-byte", do_goto, ESsi, 'b',
+          "us{Goto byte: }"
+          "v")
+    CMD0( KEY_NONE, KEY_NONE,
+          "toggle-hex", do_toggle_hex)
     CMD_DEF_END,
 };
 

Index: html.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- html.c      4 Jan 2008 22:24:38 -0000       1.14
+++ html.c      4 Jan 2008 23:04:11 -0000       1.15
@@ -865,9 +865,12 @@
 /* specific html commands */
 static CmdDef html_commands[] = {
     /* should use 'k' intrinsic argument */
-    CMDV( '<', KEY_NONE, "html-electric-lt", do_html_electric, ESi, '<', "*v")
-    CMDV( '>', KEY_NONE, "html-electric-gt", do_html_electric, ESi, '>', "*v")
-    CMDV( '&', KEY_NONE, "html-electric-amp", do_html_electric, ESi, '&', "*v")
+    CMDV( '<', KEY_NONE,
+          "html-electric-lt", do_html_electric, ESi, '<', "*v")
+    CMDV( '>', KEY_NONE,
+          "html-electric-gt", do_html_electric, ESi, '>', "*v")
+    CMDV( '&', 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- image.c     4 Jan 2008 22:24:38 -0000       1.15
+++ image.c     4 Jan 2008 23:04:11 -0000       1.16
@@ -800,19 +800,27 @@
 
 /* specific image commands */
 static CmdDef image_commands[] = {
-    CMD0( 't', KEY_NONE, "image-rotate", image_rotate)
-    CMD_( 'c', KEY_NONE, "image-convert", image_convert, ESs,
+    CMD0( 't', KEY_NONE,
+          "image-rotate", image_rotate)
+    CMD_( 'c', KEY_NONE,
+          "image-convert", image_convert, ESs,
           "s{New pixel format: }[pixel_format]|pixel_format|")
-    CMD_( 'b', KEY_NONE, "image-set-background-color",
-          image_set_background_color, ESs,
+    CMD_( 'b', KEY_NONE,
+          "image-set-background-color", image_set_background_color, ESs,
           "s{Background color (use 'transparent' for tiling): }")
 #if 1
-    CMD0( 'n', KEY_NONE, "image-normal-size", image_normal_size)
-    CMD1( '>', KEY_NONE, "image-double-size", image_mult_size, 100)
-    CMD1( '<', KEY_NONE, "image-halve-size", image_mult_size, -50)
-    CMD1( '.', KEY_NONE, "image-larger-10", image_mult_size, 10)
-    CMD1( ',', KEY_NONE, "image-smaller-10", image_mult_size, -10)
-    CMD_( 'S', KEY_NONE, "image-set-display-size", image_set_size, ESii,
+    CMD0( 'n', KEY_NONE,
+          "image-normal-size", image_normal_size)
+    CMD1( '>', KEY_NONE,
+          "image-double-size", image_mult_size, 100)
+    CMD1( '<', KEY_NONE,
+          "image-halve-size", image_mult_size, -50)
+    CMD1( '.', KEY_NONE,
+          "image-larger-10", image_mult_size, 10)
+    CMD1( ',', KEY_NONE,
+          "image-smaller-10", image_mult_size, -10)
+    CMD_( 'S', KEY_NONE,
+          "image-set-display-size", image_set_size, ESii,
           "i{Displayed width: }"
           "i{Displayed height: }")
 #endif

Index: latex-mode.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- latex-mode.c        4 Jan 2008 22:24:38 -0000       1.23
+++ latex-mode.c        4 Jan 2008 23:04:11 -0000       1.24
@@ -313,9 +313,11 @@
 
 /* specific LaTeX commands */
 static CmdDef latex_commands[] = {
-    CMD_( '\"', KEY_NONE, "tex-insert-quote", do_tex_insert_quote, ES, "*")
+    CMD_( '\"', 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, "TeX-command-master", do_latex, ESs,
+    CMD_( KEY_CTRL('c'), KEY_NONE,
+          "TeX-command-master", do_latex, ESs,
           "s{Command: (default LaTeX) }[latex]|latex|")
     CMD_DEF_END,
 };

Index: qeconfig.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qeconfig.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- qeconfig.h  4 Jan 2008 22:24:39 -0000       1.27
+++ qeconfig.h  4 Jan 2008 23:04:11 -0000       1.28
@@ -26,111 +26,163 @@
 
     /*---------------- Simple commands ----------------*/
 
-    CMDV( KEY_DEFAULT, KEY_NONE, "self-insert-command", do_char, ESii, ' ',
+    CMDV( KEY_DEFAULT, KEY_NONE,
+         "self-insert-command", do_char, ESii, ' ',
           "*" "v" "ui")
-    CMD_( KEY_META('#'), KEY_NONE, "insert-char", do_char, ESii,
+    CMD_( KEY_META('#'), KEY_NONE,
+          "insert-char", do_char, ESii,
           "*" "i{Insert char: }" "ui")
-    CMD1( KEY_CTRL('p'), KEY_UP, "previous-line", do_up_down, -1 )
-    CMD1( KEY_CTRL('n'), KEY_DOWN, "next-line", do_up_down, 1 )
-    CMD1( KEY_CTRL('b'), KEY_LEFT, "backward-char", do_left_right, -1 )
-    CMD1( KEY_CTRL('f'), KEY_RIGHT, "forward-char", do_left_right, 1 )
-    CMD1( KEY_META('b'), KEY_CTRL_LEFT, "backward-word", do_word_right, -1 )
-    CMD1( KEY_META('f'), KEY_CTRL_RIGHT, "forward-word", do_word_right, 1 )
-    CMD1( KEY_META('v'), KEY_PAGEUP, "scroll-down", do_scroll_up_down, -2 ) /* 
u? */
-    CMD1( KEY_CTRL('v'), KEY_PAGEDOWN, "scroll-up", do_scroll_up_down, 2 ) /* 
u? */
-    CMD1( KEY_META('z'), KEY_NONE, "scroll-down-one", do_scroll_up_down, -1 ) 
/* u? */
-    CMD1( KEY_CTRL('z'), KEY_NONE, "scroll-up-one", do_scroll_up_down, 1 ) /* 
u? */
-    CMD0( KEY_CTRL('a'), KEY_HOME, "beginning-of-line", do_bol)
-    CMD0( KEY_CTRL('e'), KEY_END, "end-of-line", do_eol)
-    CMD0( KEY_INSERT, KEY_NONE, "overwrite-mode", do_insert)
+    CMD1( KEY_CTRL('p'), KEY_UP,
+          "previous-line", do_up_down, -1 )
+    CMD1( KEY_CTRL('n'), KEY_DOWN,
+          "next-line", do_up_down, 1 )
+    CMD1( KEY_CTRL('b'), KEY_LEFT,
+          "backward-char", do_left_right, -1 )
+    CMD1( KEY_CTRL('f'), KEY_RIGHT,
+          "forward-char", do_left_right, 1 )
+    CMD1( KEY_META('b'), KEY_CTRL_LEFT,
+          "backward-word", do_word_right, -1 )
+    CMD1( KEY_META('f'), KEY_CTRL_RIGHT,
+          "forward-word", do_word_right, 1 )
+    CMD1( KEY_META('v'), KEY_PAGEUP,
+          "scroll-down", do_scroll_up_down, -2 ) /* u? */
+    CMD1( KEY_CTRL('v'), KEY_PAGEDOWN,
+          "scroll-up", do_scroll_up_down, 2 ) /* u? */
+    CMD1( KEY_META('z'), KEY_NONE,
+          "scroll-down-one", do_scroll_up_down, -1 ) /* u? */
+    CMD1( KEY_CTRL('z'), KEY_NONE,
+          "scroll-up-one", do_scroll_up_down, 1 ) /* u? */
+    CMD0( KEY_CTRL('a'), KEY_HOME,
+          "beginning-of-line", do_bol)
+    CMD0( KEY_CTRL('e'), KEY_END,
+          "end-of-line", do_eol)
+    CMD0( KEY_INSERT, KEY_NONE,
+          "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, "delete-char", do_delete_char, ESi, "*ui")
-    CMD_( 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 )
+    CMD_( KEY_CTRL('d'), KEY_DELETE,
+          "delete-char", do_delete_char, ESi, "*ui")
+    CMD_( 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, "tabulate", do_tab, ESi, "ui")
+    CMD_( 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, "quoted-insert", do_quote, ESi, "*ui")
-    CMDV( KEY_CTRL('j'), KEY_RET, "newline", do_return, ESi, 1, "*v")
-    CMDV( KEY_CTRL('o'), KEY_NONE, "open-line", do_return, ESi, 0, "*v")
+    CMD_( KEY_CTRL('q'), KEY_NONE,
+          "quoted-insert", do_quote, ESi, "*ui")
+    CMDV( KEY_CTRL('j'), KEY_RET,
+          "newline", do_return, ESi, 1, "*v")
+    CMDV( KEY_CTRL('o'), KEY_NONE,
+          "open-line", do_return, ESi, 0, "*v")
 
     /*---------------- Region handling / Kill commands ----------------*/
 
-    CMD0( KEY_CTRL('@'), KEY_NONE, "set-mark-command", do_set_mark )
-    CMD0( KEY_CTRLX(KEY_CTRL('x')), KEY_NONE, "exchange-point-and-mark",
-          do_exchange_point_and_mark)
-    CMD0( KEY_CTRLX('h'), KEY_NONE, "mark-whole-buffer", do_mark_whole_buffer)
-    CMD0( KEY_META(KEY_CTRL('w')) , KEY_NONE,
+    CMD0( KEY_CTRL('@'), KEY_NONE,
+          "set-mark-command", do_set_mark)
+    CMD0( KEY_CTRLX(KEY_CTRL('x')), KEY_NONE,
+          "exchange-point-and-mark", do_exchange_point_and_mark)
+    CMD0( KEY_CTRLX('h'), KEY_NONE,
+          "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, "kill-line", do_kill_line, ESi, 1, "*v" )
+    CMDV( KEY_CTRL('k'), KEY_NONE,
+          "kill-line", do_kill_line, ESi, 1, "*v" )
     CMDV( KEY_NONE, KEY_NONE,
           "kill-beginning-of-line", do_kill_line, ESi, -1, "*v" )
-    CMDV( KEY_META(KEY_DEL) , KEY_META(KEY_BS),
+    CMDV( KEY_META(KEY_DEL), KEY_META(KEY_BS),
           "backward-kill-word", do_kill_word, ESi, -1, "*v" )
-    CMDV( KEY_META('d') , KEY_NONE, "kill-word", do_kill_word, ESi, 1, "*v" )
-    CMDV( 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, "yank", do_yank, ES, "*")
-    CMD_( KEY_META('y'), KEY_NONE, "yank-pop", do_yank_pop, ES, "*")
+    CMDV( KEY_META('d'), KEY_NONE,
+          "kill-word", do_kill_word, ESi, 1, "*v" )
+    CMDV( 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,
+          "yank", do_yank, ES, "*")
+    CMD_( KEY_META('y'), KEY_NONE,
+          "yank-pop", do_yank_pop, ES, "*")
 
     /*---------------- Buffer and file handling ----------------*/
 
-    CMD_( KEY_CTRLX(KEY_CTRL('f')), KEY_NONE, "find-file", do_find_file, ESs,
+    CMD_( KEY_CTRLX(KEY_CTRL('f')), KEY_NONE,
+          "find-file", do_find_file, ESs,
           "s{Find file: }[file]|file|") /* u? */
-    CMD_( KEY_CTRLX(KEY_CTRL('v')), KEY_NONE, "find-alternate-file",
-          do_find_alternate_file, ESs,
+    CMD_( 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, "insert-file", do_insert_file, ESs,
+    CMD_( 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, "write-file", do_write_file, ESs,
+    CMD0( KEY_CTRLX(KEY_CTRL('s')), KEY_NONE,
+          "save-buffer", do_save_buffer) /* u? */
+    CMD_( 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, "write-region", do_write_region, ESs,
+    CMD_( 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, "switch-to-buffer", do_switch_to_buffer, 
ESs,
+    CMD_( 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, "kill-buffer", do_kill_buffer, ESs,
+    CMD_( 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, "not-modified", do_not_modified, ESi, "ui")
-    CMD_( KEY_NONE, KEY_NONE, "set-visited-file-name",
-          do_set_visited_file_name, ESss,
+    CMD0( KEY_CTRLX(KEY_CTRL('q')), KEY_NONE,
+          "toggle-read-only", do_toggle_read_only)
+    CMD_( KEY_META('~'), KEY_NONE,
+          "not-modified", do_not_modified, ESi, "ui")
+    CMD_( 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, "search-forward", do_search_string, ESsi, 1,
+    CMDV( KEY_META('S'), KEY_NONE,
+          "search-forward", do_search_string, ESsi, 1,
          "s{Search forward: }|search|"
          "v")
-    CMDV( KEY_META('R'), KEY_NONE, "search-backward", do_search_string, ESsi, 
-1,
+    CMDV( KEY_META('R'), KEY_NONE,
+          "search-backward", do_search_string, ESsi, -1,
          "s{Search backward: }|search|"
          "v")
     /* passing argument should switch to regex incremental search */
-    CMD1( KEY_CTRL('r'), KEY_NONE, "isearch-backward", do_isearch, -1 )
-    CMD1( KEY_CTRL('s'), KEY_NONE, "isearch-forward", do_isearch, 1 )
-    CMD_( KEY_META('%'), KEY_NONE, "query-replace", do_query_replace, ESss,
+    CMD1( KEY_CTRL('r'), KEY_NONE,
+          "isearch-backward", do_isearch, -1 )
+    CMD1( KEY_CTRL('s'), KEY_NONE,
+          "isearch-forward", do_isearch, 1 )
+    CMD_( 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, "replace-string", do_replace_string, ESssi,
+    CMD_( KEY_META('r'), KEY_NONE,
+          "replace-string", do_replace_string, ESssi,
          "*" "s{Replace String: }|search|"
          "s{With: }|replace|"
          "ui")
 
     /*---------------- Paragraph / case handling ----------------*/
 
-    CMD0( KEY_META('{'), KEY_NONE, "backward-paragraph", do_backward_paragraph)
-    CMD0( KEY_META('}'), KEY_NONE, "forward-paragraph", do_forward_paragraph)
-    CMD_( KEY_META('q'), KEY_NONE, "fill-paragraph", do_fill_paragraph, ES, 
"*")
-    CMDV( KEY_NONE, KEY_NONE, "kill-paragraph", do_kill_paragraph, ESi, 1, 
"*v")
-
-    CMDV( KEY_META('c'), KEY_NONE, "capitalize-word", do_changecase_word, ESi, 
2, "*v")
-    CMDV( KEY_META('l'), KEY_NONE, "downcase-word", do_changecase_word, ESi, 
-1, "*v")
-    CMDV( KEY_META('u'), KEY_NONE, "upcase-word", do_changecase_word, ESi, 1, 
"*v")
+    CMD0( KEY_META('{'), KEY_NONE,
+          "backward-paragraph", do_backward_paragraph)
+    CMD0( KEY_META('}'), KEY_NONE,
+          "forward-paragraph", do_forward_paragraph)
+    CMD_( KEY_META('q'), KEY_NONE,
+          "fill-paragraph", do_fill_paragraph, ES, "*")
+    CMDV( KEY_NONE, KEY_NONE,
+          "kill-paragraph", do_kill_paragraph, ESi, 1, "*v")
+
+    CMDV( KEY_META('c'), KEY_NONE,
+          "capitalize-word", do_changecase_word, ESi, 2, "*v")
+    CMDV( KEY_META('l'), KEY_NONE,
+          "downcase-word", do_changecase_word, ESi, -1, "*v")
+    CMDV( KEY_META('u'), KEY_NONE,
+          "upcase-word", do_changecase_word, ESi, 1, "*v")
     CMDV( KEY_META(KEY_CTRL('c')), KEY_NONE,
           "capitalize-region", do_changecase_region, ESi, 2, "*v")
     CMDV( KEY_CTRLX(KEY_CTRL('l')), KEY_NONE,
@@ -140,26 +192,34 @@
 
     /*---------------- Command handling ----------------*/
 
-    CMD_( KEY_META('x'), KEY_NONE, "execute-command", do_execute_command, ESsi,
+    CMD_( KEY_META('x'), KEY_NONE,
+          "execute-command", do_execute_command, ESsi,
          "s{Command: }[command]|command|"
          "ui")
     /* M-0 thru M-9 should start universal argument */
-    CMD0( KEY_CTRL('u'), KEY_META('-'), "universal-argument",
-          do_universal_argument)
-    CMD0( KEY_CTRL('g'), KEY_CTRLX(KEY_CTRL('g')), "abort", do_break)
-    CMD0( KEY_CTRLX('('), KEY_NONE, "start-kbd-macro", do_start_macro)
-    CMD0( KEY_CTRLX(')'), KEY_NONE, "end-kbd-macro", do_end_macro)
-    CMD0( KEY_CTRLX('e'), KEY_CTRL('\\'), "call-last-kbd-macro", do_call_macro)
-    CMD_( KEY_NONE, KEY_NONE, "define-kbd-macro", do_define_kbd_macro, ESsss,
+    CMD0( KEY_CTRL('u'), KEY_META('-'),
+          "universal-argument", do_universal_argument)
+    CMD0( KEY_CTRL('g'), KEY_CTRLX(KEY_CTRL('g')),
+          "abort", do_break)
+    CMD0( KEY_CTRLX('('), KEY_NONE,
+          "start-kbd-macro", do_start_macro)
+    CMD0( KEY_CTRLX(')'), KEY_NONE,
+          "end-kbd-macro", do_end_macro)
+    CMD0( KEY_CTRLX('e'), KEY_CTRL('\\'),
+          "call-last-kbd-macro", do_call_macro)
+    CMD_( 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, "global-set-key", do_set_key, ESssi, 0,
+    CMDV( 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, "local-set-key", do_set_key, ESssi, 1,
+    CMDV( KEY_NONE, KEY_NONE,
+          "local-set-key", do_set_key, ESssi, 1,
           "s{Set key locally: }[key]"
          "s{command: }[command]|command|"
          "v")
@@ -167,132 +227,172 @@
     /*---------------- Window handling ----------------*/
 
     /* should merge these functions */
-    CMD0( KEY_CTRLX('o'), KEY_NONE, "other-window", do_other_window)
-    CMD0( KEY_CTRLX('n'), KEY_NONE, "next-window", do_other_window)
-    CMD0( KEY_CTRLX('p'), KEY_NONE, "previous-window", do_previous_window)
+    CMD0( KEY_CTRLX('o'), KEY_NONE,
+          "other-window", do_other_window)
+    CMD0( KEY_CTRLX('n'), KEY_NONE,
+          "next-window", do_other_window)
+    CMD0( KEY_CTRLX('p'), KEY_NONE,
+          "previous-window", do_previous_window)
 #ifndef CONFIG_TINY
-    CMD0( KEY_META(KEY_CTRL('l')), KEY_NONE, "center-cursor", do_center_cursor)
-    CMD1( KEY_CTRL('x'), KEY_UP, "find-window-up", do_find_window,
-          KEY_UP)
-    CMD1( KEY_CTRL('x'), KEY_DOWN, "find-window-down", do_find_window,
-          KEY_DOWN)
-    CMD1( KEY_CTRL('x'), KEY_LEFT, "find-window-left", do_find_window,
-          KEY_LEFT)
-    CMD1( KEY_CTRL('x'), KEY_RIGHT, "find-window-right", do_find_window,
-          KEY_RIGHT)
+    CMD0( KEY_META(KEY_CTRL('l')), KEY_NONE,
+          "center-cursor", do_center_cursor)
+    CMD1( KEY_CTRL('x'), KEY_UP,
+          "find-window-up", do_find_window, KEY_UP)
+    CMD1( KEY_CTRL('x'), KEY_DOWN,
+          "find-window-down", do_find_window, KEY_DOWN)
+    CMD1( KEY_CTRL('x'), KEY_LEFT,
+          "find-window-left", do_find_window, KEY_LEFT)
+    CMD1( KEY_CTRL('x'), KEY_RIGHT,
+          "find-window-right", do_find_window, KEY_RIGHT)
 #endif
-    CMD1( KEY_CTRLX('0'), KEY_NONE, "delete-window", do_delete_window, 0)
-    CMD0( KEY_CTRLX('1'), KEY_NONE, "delete-other-windows",
-          do_delete_other_windows)
-    CMD1( KEY_CTRLX('2'), KEY_NONE, "split-window-vertically",
-          do_split_window, 0) /* u? */
-    CMD1( KEY_CTRLX('3'), KEY_NONE, "split-window-horizontally",
-          do_split_window, 1) /* u? */
-    CMD0( KEY_CTRLX('f'), KEY_NONE, "toggle-full-screen",
-          do_toggle_full_screen)
-    CMD0( KEY_NONE, KEY_NONE, "toggle-mode-line", do_toggle_mode_line)
+    CMD1( KEY_CTRLX('0'), KEY_NONE,
+          "delete-window", do_delete_window, 0)
+    CMD0( KEY_CTRLX('1'), KEY_NONE,
+          "delete-other-windows", do_delete_other_windows)
+    CMD1( KEY_CTRLX('2'), KEY_NONE,
+          "split-window-vertically", do_split_window, 0) /* u? */
+    CMD1( KEY_CTRLX('3'), KEY_NONE,
+          "split-window-horizontally", do_split_window, 1) /* u? */
+    CMD0( KEY_CTRLX('f'), KEY_NONE,
+          "toggle-full-screen", do_toggle_full_screen)
+    CMD0( KEY_NONE, KEY_NONE,
+          "toggle-mode-line", do_toggle_mode_line)
 
     /*---------------- Help ----------------*/
 
-    CMD0( KEY_CTRLH(KEY_CTRL('h')), KEY_F1, "help-for-help", do_help_for_help)
-    CMD0( KEY_CTRLH('b'), KEY_NONE, "describe-bindings", do_describe_bindings)
-    CMD0( KEY_CTRLH('c'), KEY_CTRLH('k'), "describe-key-briefly",
-          do_describe_key_briefly)
+    CMD0( KEY_CTRLH(KEY_CTRL('h')), KEY_F1,
+          "help-for-help", do_help_for_help)
+    CMD0( KEY_CTRLH('b'), KEY_NONE,
+          "describe-bindings", do_describe_bindings)
+    CMD0( KEY_CTRLH('c'), KEY_CTRLH('k'),
+          "describe-key-briefly", do_describe_key_briefly)
 
     /*---------------- International ----------------*/
 
-    CMD_( KEY_CTRLXRET('f'), KEY_NONE, "set-buffer-file-coding-system",
-          do_set_buffer_file_coding_system, ESs,
+    CMD_( 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, "convert-buffer-file-coding-system",
-          do_convert_buffer_file_coding_system, ESs,
+    CMD_( 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, "set-input-method",
-          do_set_input_method, ESs,
+    CMD0( KEY_CTRLXRET('b'), KEY_NONE,
+          "toggle-bidir", do_toggle_bidir)
+    CMD_( 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, "define-color", do_define_color, ESss,
+    CMD_( 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, "set-style", do_set_style, ESsss,
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-style", do_set_style, ESsss,
           "s{Style: }[style]|style|"
           "s{CSS Property Name: }"
           "s{CSS Property Value: }")
-    CMD_( KEY_NONE, KEY_NONE, "set-display-size", do_set_display_size, ESii,
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-display-size", do_set_display_size, ESii,
          "i{Width: }"
          "i{Height: }")
-    CMD_( KEY_NONE, KEY_NONE, "set-system-font", do_set_system_font, ESss,
+    CMD_( 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, "exit-qemacs",
-          do_exit_qemacs, ESi, "ui")
-    CMD0( KEY_CTRL('l'), KEY_NONE, "refresh", do_refresh_complete)
-    CMD0( KEY_NONE, KEY_NONE, "doctor", do_doctor)
-    CMD0( KEY_CTRLX('u'), KEY_CTRL('_'), "undo", do_undo)
-    CMDV( KEY_META('g'), KEY_NONE, "goto-line", do_goto, ESsi, 'l',
+    CMD_( KEY_CTRLX(KEY_CTRL('c')), KEY_NONE,
+          "exit-qemacs", do_exit_qemacs, ESi, "ui")
+    CMD0( KEY_CTRL('l'), KEY_NONE,
+          "refresh", do_refresh_complete)
+    CMD0( KEY_NONE, KEY_NONE,
+          "doctor", do_doctor)
+    CMD0( KEY_CTRLX('u'), KEY_CTRL('_'),
+          "undo", do_undo)
+    CMDV( KEY_META('g'), KEY_NONE,
+          "goto-line", do_goto, ESsi, 'l',
           "us{Goto line: }" "v")
-    CMDV( KEY_CTRLX('g'), KEY_NONE, "goto-char", do_goto, ESsi, 'c',
+    CMDV( KEY_CTRLX('g'), KEY_NONE,
+          "goto-char", do_goto, ESsi, 'c',
           "us{Goto char: }" "v")
-    CMD0( KEY_CTRLX('l'), KEY_NONE, "count-lines", do_count_lines)
-    CMD0( KEY_CTRLX('='), KEY_NONE, "what-cursor-position",
-          do_what_cursor_position)
+    CMD0( KEY_CTRLX('l'), KEY_NONE,
+          "count-lines", do_count_lines)
+    CMD0( KEY_CTRLX('='), KEY_NONE,
+          "what-cursor-position", do_what_cursor_position)
 
     /* non standard mappings */
-    CMD0( KEY_CTRLXRET('l'), KEY_NONE, "toggle-line-numbers",
-          do_toggle_line_numbers)
-    CMD0( KEY_CTRLXRET('t'), KEY_NONE, "toggle-truncate-lines",
-          do_toggle_truncate_lines)
-    CMD0( KEY_CTRLXRET('w'), KEY_NONE, "word-wrap", do_word_wrap)
-    CMD1( KEY_NONE, KEY_NONE, "toggle-control-h", do_toggle_control_h, 0)
-    CMD_( KEY_NONE, KEY_NONE, "set-emulation", do_set_emulation, ESs,
+    CMD0( KEY_CTRLXRET('l'), KEY_NONE,
+          "toggle-line-numbers", do_toggle_line_numbers)
+    CMD0( KEY_CTRLXRET('t'), KEY_NONE,
+          "toggle-truncate-lines", do_toggle_truncate_lines)
+    CMD0( KEY_CTRLXRET('w'), KEY_NONE,
+          "word-wrap", do_word_wrap)
+    CMD1( KEY_NONE, KEY_NONE,
+          "toggle-control-h", do_toggle_control_h, 0)
+    CMD_( 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, "cd", do_cd, ESs,
+    CMD0( KEY_NONE, KEY_NONE,
+          "set-trace", do_set_trace)
+    CMD_( KEY_NONE, KEY_NONE,
+          "cd", do_cd, ESs,
           "s{Change default directory: }[file]|file|")
-    CMD_( KEY_NONE, KEY_NONE, "set-mode", do_set_mode, ESs,
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-mode", do_set_mode, ESs,
           "s{Set mode: }[mode]")
 
     /* tab & indent */
-    CMD_( KEY_NONE, KEY_NONE, "set-tab-width", do_set_tab_width, ESi,
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-tab-width", do_set_tab_width, ESi,
           "ui{Tab width: }")
-    CMD_( KEY_NONE, KEY_NONE, "set-indent-width", do_set_indent_width, ESi,
+    CMD_( KEY_NONE, KEY_NONE,
+          "set-indent-width", do_set_indent_width, ESi,
           "ui{Indent width: }")
-    CMD_( KEY_NONE, KEY_NONE, "set-indent-tabs-mode", do_set_indent_tabs_mode, 
ESi,
+    CMD_( 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, "load-file-from-path", do_load_file_from_path, 
ESs,
+    CMD_( 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, "load-config-file", do_load_config_file, ESs,
+    CMD_( KEY_NONE, KEY_NONE,
+          "load-config-file", do_load_config_file, ESs,
           "s{Configuration file: }[file]|file|")
-    CMD_( KEY_NONE, KEY_NONE, "load-qerc", do_load_qerc, ESs,
+    CMD_( KEY_NONE, KEY_NONE,
+          "load-qerc", do_load_qerc, ESs,
           "s{path: }[file]|file|")
 
     CMD_DEF_END,
 };
 
 CmdDef minibuffer_commands[] = {
-    CMD1( KEY_RET, KEY_NONE, "minibuffer-exit", do_minibuffer_exit, 0)
-    CMD1( KEY_CTRL('g'), KEY_NONE, "minibuffer-abort", do_minibuffer_exit, 1)
-    CMD0( KEY_CTRL('i'), KEY_NONE, "minibuffer-complete", do_completion)
+    CMD1( KEY_RET, KEY_NONE,
+          "minibuffer-exit", do_minibuffer_exit, 0)
+    CMD1( KEY_CTRL('g'), KEY_NONE,
+          "minibuffer-abort", do_minibuffer_exit, 1)
+    CMD0( KEY_CTRL('i'), KEY_NONE,
+          "minibuffer-complete", do_completion)
     /* should take numeric prefix to specify word size */
-    CMD0( KEY_META('='), KEY_NONE, "minibuffer-get-binary", 
do_minibuffer_get_binary)
-    CMD0( ' ', KEY_NONE, "minibuffer-complete-space", do_completion_space)
-    CMD1( KEY_CTRL('p'), KEY_UP, "previous-history-element", do_history, -1 )
-    CMD1( KEY_CTRL('n'), KEY_DOWN, "next-history-element", do_history, 1 )
+    CMD0( KEY_META('='), KEY_NONE,
+          "minibuffer-get-binary", do_minibuffer_get_binary)
+    CMD0( ' ', KEY_NONE,
+          "minibuffer-complete-space", do_completion_space)
+    CMD1( KEY_CTRL('p'), KEY_UP,
+          "previous-history-element", do_history, -1)
+    CMD1( KEY_CTRL('n'), KEY_DOWN,
+          "next-history-element", do_history, 1)
     CMD_DEF_END,
 };
 
 CmdDef less_commands[] = {
-    CMD0( 'q', KEY_CTRL('g'), "less-exit", do_less_exit)
-    CMD1( '/', KEY_NONE, "less-isearch", do_isearch, 1)
+    CMD0( 'q', KEY_CTRL('g'),
+          "less-exit", do_less_exit)
+    CMD1( '/', KEY_NONE,
+          "less-isearch", do_isearch, 1)
     CMD_DEF_END,
 };
 

Index: shell.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/shell.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- shell.c     4 Jan 2008 22:24:39 -0000       1.38
+++ shell.c     4 Jan 2008 23:04:11 -0000       1.39
@@ -1404,27 +1404,37 @@
 
 /* specific shell commands */
 static CmdDef shell_commands[] = {
-    CMD0( KEY_CTRL('o'), KEY_NONE, "shell-toggle-input", do_shell_toggle_input)
-    CMD1( '\r', KEY_NONE, "shell-return", shell_write_char, '\r')
+    CMD0( KEY_CTRL('o'), KEY_NONE,
+          "shell-toggle-input", do_shell_toggle_input)
+    CMD1( '\r', KEY_NONE,
+          "shell-return", shell_write_char, '\r')
     /* CG: should send s->kbs */
-    CMD1( 127, KEY_NONE, "shell-backward-delete-char", shell_write_char, 127)
-    CMD1( KEY_CTRL('c'), KEY_NONE, "shell-intr", shell_write_char, 3)
-    CMD1( KEY_CTRL('d'), KEY_DELETE, "shell-delete-char", shell_write_char, 4)
-    CMD1( KEY_CTRL('i'), KEY_NONE, "shell-tabulate", shell_write_char, 9)
-    CMD1( KEY_CTRL('k'), KEY_NONE, "shell-kill-line", shell_write_char, 11)
-    CMD1( KEY_CTRL('y'), KEY_NONE, "shell-yank", shell_write_char, 25)
+    CMD1( 127, KEY_NONE,
+          "shell-backward-delete-char", shell_write_char, 127)
+    CMD1( KEY_CTRL('c'), KEY_NONE,
+          "shell-intr", shell_write_char, 3)
+    CMD1( KEY_CTRL('d'), KEY_DELETE,
+          "shell-delete-char", shell_write_char, 4)
+    CMD1( KEY_CTRL('i'), KEY_NONE,
+          "shell-tabulate", shell_write_char, 9)
+    CMD1( KEY_CTRL('k'), KEY_NONE,
+          "shell-kill-line", shell_write_char, 11)
+    CMD1( KEY_CTRL('y'), KEY_NONE,
+          "shell-yank", shell_write_char, 25)
     CMD_DEF_END,
 };
 
 /* compilation commands */
 static CmdDef compile_commands[] = {
-    CMD_( KEY_CTRLXRET('\r'), KEY_NONE, "shell", do_shell, ESi, "ui")
-    CMD_( KEY_CTRLX(KEY_CTRL('e')), KEY_NONE, "compile", do_compile, ESs,
+    CMD_( KEY_CTRLXRET('\r'), KEY_NONE,
+          "shell", do_shell, ESi, "ui")
+    CMD_( KEY_CTRLX(KEY_CTRL('e')), KEY_NONE,
+          "compile", do_compile, ESs,
           "s{Compile command: }|compile|")
-    CMD1( KEY_CTRLX(KEY_CTRL('p')), KEY_NONE, "previous-error",
-          do_compile_error, -1) /* u */
-    CMD1( KEY_CTRLX(KEY_CTRL('n')), KEY_CTRLX('`'), "next-error",
-          do_compile_error, 1) /* u */
+    CMD1( KEY_CTRLX(KEY_CTRL('p')), KEY_NONE,
+          "previous-error", do_compile_error, -1) /* u */
+    CMD1( KEY_CTRLX(KEY_CTRL('n')), KEY_CTRLX('`'),
+          "next-error", do_compile_error, 1) /* u */
     CMD_DEF_END,
 };
 

Index: video.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/video.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- video.c     4 Jan 2008 22:24:39 -0000       1.10
+++ video.c     4 Jan 2008 23:04:11 -0000       1.11
@@ -940,9 +940,12 @@
 
 /* specific image commands */
 static CmdDef video_commands[] = {
-    CMD0( ' ', 'p', "av-pause", video_pause)
-    CMD1( 'v', KEY_NONE, "av-cycle-video", av_cycle_stream, CODEC_TYPE_VIDEO)
-    CMD1( 'a', KEY_NONE, "av-cycle-audio", av_cycle_stream, CODEC_TYPE_AUDIO)
+    CMD0( ' ', 'p',
+          "av-pause", video_pause)
+    CMD1( 'v', KEY_NONE,
+          "av-cycle-video", av_cycle_stream, CODEC_TYPE_VIDEO)
+    CMD1( 'a', KEY_NONE,
+          "av-cycle-audio", av_cycle_stream, CODEC_TYPE_AUDIO)
     CMD_DEF_END,
 };
 

Index: plugin-example/my_plugin.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/plugin-example/my_plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- plugin-example/my_plugin.c  27 Dec 2007 10:04:10 -0000      1.3
+++ plugin-example/my_plugin.c  4 Jan 2008 23:04:12 -0000       1.4
@@ -15,7 +15,8 @@
 }
 
 static CmdDef my_commands[] = {
-    CMD_( KEY_CTRLX('h'), KEY_NONE, "insert-hello", insert_hello, ES, "*")
+    CMD_( KEY_CTRLX('h'), KEY_NONE,
+          "insert-hello", insert_hello, ES, "*")
     CMD_DEF_END,
 };
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]