[Qemacs-devel] Changes to qemacs/qeconfig.h

[Charlie Gordon]

Index: qemacs/qeconfig.h
diff -u qemacs/qeconfig.h:1.8 qemacs/qeconfig.h:1.9
--- qemacs/qeconfig.h:1.8       Mon May  9 02:42:08 2005
+++ qemacs/qeconfig.h   Mon May  9 03:19:36 2005
@@ -29,10 +29,10 @@
     CMD0( KEY_META('<'), KEY_CTRL_HOME, "beginning-of-buffer", do_bof )
     CMD0( KEY_META('>'), KEY_CTRL_END, "end-of-buffer", do_eof )
     CMD_( KEY_META('x'), KEY_NONE, "execute-extended-command",
-         do_execute_command,
-         "s{Command: }[command]|command|i" )
+          do_execute_command,
+          "s{Command: }[command]|command|i")
     CMD0( KEY_CTRL('u'), KEY_NONE, "universal-argument",
-         do_universal_argument )
+          do_universal_argument)
     CMD0( KEY_CTRL('y'), KEY_NONE, "yank", do_yank)
     CMD0( KEY_META('y'), KEY_NONE, "yank-pop", do_yank_pop)
     CMD0( KEY_CTRL('i'), KEY_NONE, "tabulate", do_tab)
@@ -41,31 +41,32 @@
     CMD1( KEY_CTRLX(KEY_CTRL('w')), KEY_NONE, "write-file", do_save, 1 )
     CMD0( KEY_CTRLX(KEY_CTRL('c')), KEY_NONE, "suspend-emacs", do_quit )
     CMD_( KEY_CTRLX(KEY_CTRL('f')), KEY_NONE, "find-file", do_load,
-         "s{Find file: }[file]|file|")
+          "s{Find file: }[file]|file|")
     CMD_( KEY_CTRLX(KEY_CTRL('v')), KEY_NONE, "find-alternate-file", 
-         do_find_alternate_file,
-         "s{Find alternate file: }[file]|file|")
+          do_find_alternate_file,
+          "s{Find alternate file: }[file]|file|")
     CMD_( KEY_CTRLX('b'), KEY_NONE, "switch-to-buffer", do_switch_to_buffer,
-         "s{Switch to buffer: }[buffer]|buffer|")
+          "s{Switch to buffer: }[buffer]|buffer|")
     CMD_( KEY_CTRLX('k'), KEY_NONE, "kill-buffer", do_kill_buffer,
-         "s{Kill buffer: }[buffer]|buffer|")
+          "s{Kill buffer: }[buffer]|buffer|")
     CMD_( KEY_CTRLX('i'), KEY_NONE, "insert-file", do_insert_file,
-         "s{Insert file: }[file]|file|")
+          "s{Insert file: }[file]|file|")
     CMD0( KEY_CTRL('g'), KEY_NONE, "abort", do_break)
     CMD0( KEY_NONE, KEY_NONE, "doctor", do_doctor)
     CMDV( KEY_NONE, KEY_NONE, "search-forward", do_search_string, 1,
-         "s{Search forward: }|search|v")
+          "s{Search forward: }|search|v")
     CMDV( KEY_NONE, KEY_NONE, "search-backward", do_search_string, -1,
-         "s{Search backward: }|search|v")
+          "s{Search backward: }|search|v")
     CMD1( KEY_CTRL('s'), KEY_NONE, "isearch-forward", do_isearch, 1 )
     CMD1( KEY_CTRL('r'), KEY_NONE, "isearch-backward", do_isearch, -1 )
     CMD_( KEY_META('%'), KEY_NONE, "query-replace", do_query_replace,
-         "s{Query replace: }|search|s{With: }|replace|")
+          "s{Query replace: }|search|s{With: }|replace|")
     CMD_( KEY_META('r'), KEY_NONE, "replace-string", do_replace_string,
-         "s{Replace String: }|search|s{With: }|replace|")
+          "s{Replace String: }|search|s{With: }|replace|")
     CMD0( KEY_CTRLX('u'), KEY_CTRL('_'), "undo", do_undo)
     CMD0( KEY_RET, KEY_NONE, "newline", do_return)
     CMD0( KEY_CTRL('l'), KEY_NONE, "refresh", do_refresh_complete)
+    /* CG: should take a string if no numeric argument given */
     CMD_( KEY_META('g'), KEY_NONE, "goto-line", do_goto_line, "i{Goto line: }")
     CMD_( KEY_NONE, KEY_NONE, "goto-char", do_goto_char, "i{Goto char: }")
     CMD0( KEY_CTRLX(KEY_CTRL('q')), KEY_NONE, "vc-toggle-read-only", 
@@ -74,7 +75,7 @@
     CMD0( KEY_META('{'), KEY_NONE, "backward-paragraph", do_backward_paragraph)
     CMD0( KEY_META('}'), KEY_NONE, "forward-paragraph", do_forward_paragraph)
     CMD0( KEY_CTRLX(KEY_CTRL('x')), KEY_NONE, "exchange-point-and-mark",
-         do_exchange_point_and_mark)
+          do_exchange_point_and_mark)
     CMD1( KEY_META('l'), KEY_NONE, "downcase-word", do_changecase_word, 0)
     CMD1( KEY_META('u'), KEY_NONE, "upcase-word", do_changecase_word, 1)
     CMD1( KEY_CTRLX(KEY_CTRL('l')), KEY_NONE, "downcase-region", 
@@ -87,29 +88,29 @@
     CMD0( KEY_CTRLX(')'), KEY_NONE, "end-kbd-macro", do_end_macro)
     CMD0( KEY_CTRLX('e'), KEY_NONE, "call-last-kbd-macro", do_call_macro)
     CMD_( KEY_NONE, KEY_NONE, "define-kbd-macro", do_define_kbd_macro,
-         "s{Macro name: }[command]s{Macro keys: }s{Bind to key: }[key]")
+          "s{Macro name: }[command]s{Macro keys: }s{Bind to key: }[key]")
     CMD_( KEY_NONE, KEY_NONE, "global-set-key", do_global_set_key,
-         "s{Set key globally: }[key]s{command: }[command]|command|")
+          "s{Set key globally: }[key]s{command: }[command]|command|")
 
     /* window handling */
     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)
     CMD1( KEY_CTRL('x'), KEY_UP, "find-window-up", do_find_window,
-         KEY_UP)
+          KEY_UP)
     CMD1( KEY_CTRL('x'), KEY_DOWN, "find-window-down", do_find_window,
-         KEY_DOWN)
+          KEY_DOWN)
     CMD1( KEY_CTRL('x'), KEY_LEFT, "find-window-left", do_find_window,
-         KEY_LEFT)
+          KEY_LEFT)
     CMD1( KEY_CTRL('x'), KEY_RIGHT, "find-window-right", do_find_window,
-         KEY_RIGHT)
+          KEY_RIGHT)
     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)
+          do_delete_other_windows)
     CMD1( KEY_CTRLX('2'), KEY_NONE, "split-window-vertically",
-         do_split_window, 0)
+          do_split_window, 0)
     CMD1( KEY_CTRLX('3'), KEY_NONE, "split-window-horizontally",
-         do_split_window, 1)
+          do_split_window, 1)
     
     /* help */
     CMD0( KEY_CTRLH(KEY_CTRL('h')), KEY_F1, "help-for-help", do_help_for_help)
@@ -119,60 +120,62 @@
 
     /* international */
     CMD_( KEY_CTRLXRET('f'), KEY_NONE, "set-buffer-file-coding-system",
-         do_set_buffer_file_coding_system,
-         "s{Charset: }[charset]")
+          do_set_buffer_file_coding_system,
+          "s{Charset: }[charset]")
     CMD_( KEY_NONE, KEY_NONE, "convert-buffer-file-coding-system",
-         do_convert_buffer_file_coding_system,
-         "s{Charset: }[charset]")
+          do_convert_buffer_file_coding_system,
+          "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,
-         "s{Input method: }[input]")
+          do_set_input_method,
+          "s{Input method: }[input]")
     CMD0( KEY_CTRL('\\'), KEY_NONE, 
           "switch-input-method", do_switch_input_method)
 
     /* styles & display */
     CMD_( KEY_NONE, KEY_NONE, "define-color", do_define_color,
-         "s{Color name: }[color]|color|s{Color value: }[color]|color|")
+          "s{Color name: }[color]|color|s{Color value: }[color]|color|")
     CMD_( KEY_NONE, KEY_NONE, "set-style", do_set_style,
-         "s{Style: }[style]|style|s{CSS Property Name: }"
-         "s{CSS Property Value: }")
+          "s{Style: }[style]|style|s{CSS Property Name: }"
+          "s{CSS Property Value: }")
     CMD_( KEY_NONE, KEY_NONE, "set-display-size", do_set_display_size,
-         "i{Width: }i{Height: }")
+          "i{Width: }i{Height: }")
     CMD_( KEY_NONE, KEY_NONE, "set-system-font", do_set_system_font,
-         "s{Font family: }s{System fonts: }")
+          "s{Font family: }s{System fonts: }")
     CMD0( KEY_CTRLX('f'), KEY_NONE, "toggle-full-screen",
-         do_toggle_full_screen)
+          do_toggle_full_screen)
     CMD0( KEY_NONE, KEY_NONE, "toggle-mode-line", do_toggle_mode_line)
 
     /* other stuff */
     CMD_( KEY_NONE, KEY_NONE, "parse-config-file", parse_config,
-         "s{Configuration file: }[file]|file|")
+          "s{Configuration file: }[file]|file|")
     CMD_( KEY_NONE, KEY_NONE, "load-qerc", do_load_qerc,
-         "s{path: }[file]|file|")
+          "s{path: }[file]|file|")
     CMD_( KEY_NONE, KEY_NONE, "set-visited-file-name",
-         do_set_visited_file_name,
-         "s{Set visited file name: }[file]|file|s{Rename file? }")
+          do_set_visited_file_name,
+          "s{Set visited file name: }[file]|file|s{Rename file? }")
     
     /* non standard mappings */
-    CMD0( KEY_CTRLXRET('l'), KEY_NONE, "toggle-line-numbers", do_line_numbers)
-    CMD0( KEY_CTRLXRET('t'), KEY_NONE, "truncate-lines", do_line_truncate )
+    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,
-         "s{Emulation mode: }")
+          "s{Emulation mode: }")
     CMD_( KEY_NONE, KEY_NONE, "cd", do_cd,
-         "s{Change default directory: }[file]|file|")
+          "s{Change default directory: }[file]|file|")
     CMD_( KEY_NONE, KEY_NONE, "set-mode", do_cmd_set_mode,
-         "s{Set mode: }[mode]")
+          "s{Set mode: }[mode]")
     
     /* tab & indent */
     CMD_( KEY_NONE, KEY_NONE, "set-tab-width", do_set_tab_width,
-         "i{Tab width: }")
+          "i{Tab width: }")
     CMD_( KEY_NONE, KEY_NONE, "set-indent-width", do_set_indent_width,
-         "i{Indent width: }")
+          "i{Indent width: }")
     CMD_( KEY_NONE, KEY_NONE, "set-indent-tabs-mode", do_set_indent_tabs_mode,
-         "i{Indent tabs mode (0 or 1): }")
+          "i{Indent tabs mode (0 or 1): }")
     CMD_DEF_END,
 };