diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 18 | ||||
| -rw-r--r-- | src/w32fns.c | 8 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 84a7a0a38a5..a520e533979 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1305,9 +1305,6 @@ command_loop_1 (void) | |||
| 1305 | /* If there are warnings waiting, process them. */ | 1305 | /* If there are warnings waiting, process them. */ |
| 1306 | if (!NILP (Vdelayed_warnings_list)) | 1306 | if (!NILP (Vdelayed_warnings_list)) |
| 1307 | safe_run_hooks (Qdelayed_warnings_hook); | 1307 | safe_run_hooks (Qdelayed_warnings_hook); |
| 1308 | |||
| 1309 | if (!NILP (Vdeferred_action_list)) | ||
| 1310 | safe_run_hooks (Qdeferred_action_function); | ||
| 1311 | } | 1308 | } |
| 1312 | 1309 | ||
| 1313 | /* Do this after running Vpost_command_hook, for consistency. */ | 1310 | /* Do this after running Vpost_command_hook, for consistency. */ |
| @@ -1537,8 +1534,6 @@ command_loop_1 (void) | |||
| 1537 | if (!NILP (Vdelayed_warnings_list)) | 1534 | if (!NILP (Vdelayed_warnings_list)) |
| 1538 | safe_run_hooks (Qdelayed_warnings_hook); | 1535 | safe_run_hooks (Qdelayed_warnings_hook); |
| 1539 | 1536 | ||
| 1540 | safe_run_hooks (Qdeferred_action_function); | ||
| 1541 | |||
| 1542 | kset_last_command (current_kboard, Vthis_command); | 1537 | kset_last_command (current_kboard, Vthis_command); |
| 1543 | kset_real_last_command (current_kboard, Vreal_this_command); | 1538 | kset_real_last_command (current_kboard, Vreal_this_command); |
| 1544 | if (!CONSP (last_command_event)) | 1539 | if (!CONSP (last_command_event)) |
| @@ -12089,7 +12084,6 @@ syms_of_keyboard (void) | |||
| 12089 | DEFSYM (Qundo_auto__undoably_changed_buffers, | 12084 | DEFSYM (Qundo_auto__undoably_changed_buffers, |
| 12090 | "undo-auto--undoably-changed-buffers"); | 12085 | "undo-auto--undoably-changed-buffers"); |
| 12091 | 12086 | ||
| 12092 | DEFSYM (Qdeferred_action_function, "deferred-action-function"); | ||
| 12093 | DEFSYM (Qdelayed_warnings_hook, "delayed-warnings-hook"); | 12087 | DEFSYM (Qdelayed_warnings_hook, "delayed-warnings-hook"); |
| 12094 | DEFSYM (Qfunction_key, "function-key"); | 12088 | DEFSYM (Qfunction_key, "function-key"); |
| 12095 | 12089 | ||
| @@ -12807,17 +12801,6 @@ This keymap works like `input-decode-map', but comes after `function-key-map'. | |||
| 12807 | Another difference is that it is global rather than terminal-local. */); | 12801 | Another difference is that it is global rather than terminal-local. */); |
| 12808 | Vkey_translation_map = Fmake_sparse_keymap (Qnil); | 12802 | Vkey_translation_map = Fmake_sparse_keymap (Qnil); |
| 12809 | 12803 | ||
| 12810 | DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list, | ||
| 12811 | doc: /* List of deferred actions to be performed at a later time. | ||
| 12812 | The precise format isn't relevant here; we just check whether it is nil. */); | ||
| 12813 | Vdeferred_action_list = Qnil; | ||
| 12814 | |||
| 12815 | DEFVAR_LISP ("deferred-action-function", Vdeferred_action_function, | ||
| 12816 | doc: /* Function to call to handle deferred actions, after each command. | ||
| 12817 | This function is called with no arguments after each command | ||
| 12818 | whenever `deferred-action-list' is non-nil. */); | ||
| 12819 | Vdeferred_action_function = Qnil; | ||
| 12820 | |||
| 12821 | DEFVAR_LISP ("delayed-warnings-list", Vdelayed_warnings_list, | 12804 | DEFVAR_LISP ("delayed-warnings-list", Vdelayed_warnings_list, |
| 12822 | doc: /* List of warnings to be displayed after this command. | 12805 | doc: /* List of warnings to be displayed after this command. |
| 12823 | Each element must be a list (TYPE MESSAGE [LEVEL [BUFFER-NAME]]), | 12806 | Each element must be a list (TYPE MESSAGE [LEVEL [BUFFER-NAME]]), |
| @@ -13072,7 +13055,6 @@ syms_of_keyboard_for_pdumper (void) | |||
| 13072 | PDUMPER_RESET (num_input_keys, 0); | 13055 | PDUMPER_RESET (num_input_keys, 0); |
| 13073 | PDUMPER_RESET (num_nonmacro_input_events, 0); | 13056 | PDUMPER_RESET (num_nonmacro_input_events, 0); |
| 13074 | PDUMPER_RESET_LV (Vlast_event_frame, Qnil); | 13057 | PDUMPER_RESET_LV (Vlast_event_frame, Qnil); |
| 13075 | PDUMPER_RESET_LV (Vdeferred_action_list, Qnil); | ||
| 13076 | PDUMPER_RESET_LV (Vdelayed_warnings_list, Qnil); | 13058 | PDUMPER_RESET_LV (Vdelayed_warnings_list, Qnil); |
| 13077 | 13059 | ||
| 13078 | /* Create the initial keyboard. Qt means 'unset'. */ | 13060 | /* Create the initial keyboard. Qt means 'unset'. */ |
diff --git a/src/w32fns.c b/src/w32fns.c index 468073c9170..51540e1880c 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -797,13 +797,6 @@ w32_default_color_map (void) | |||
| 797 | return (cmap); | 797 | return (cmap); |
| 798 | } | 798 | } |
| 799 | 799 | ||
| 800 | DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map, | ||
| 801 | 0, 0, 0, doc: /* Return the default color map. */) | ||
| 802 | (void) | ||
| 803 | { | ||
| 804 | return w32_default_color_map (); | ||
| 805 | } | ||
| 806 | |||
| 807 | static Lisp_Object | 800 | static Lisp_Object |
| 808 | w32_color_map_lookup (const char *colorname) | 801 | w32_color_map_lookup (const char *colorname) |
| 809 | { | 802 | { |
| @@ -10879,7 +10872,6 @@ keys when IME input is received. */); | |||
| 10879 | /* W32 specific functions */ | 10872 | /* W32 specific functions */ |
| 10880 | 10873 | ||
| 10881 | defsubr (&Sw32_define_rgb_color); | 10874 | defsubr (&Sw32_define_rgb_color); |
| 10882 | defsubr (&Sw32_default_color_map); | ||
| 10883 | defsubr (&Sw32_display_monitor_attributes_list); | 10875 | defsubr (&Sw32_display_monitor_attributes_list); |
| 10884 | defsubr (&Sw32_send_sys_command); | 10876 | defsubr (&Sw32_send_sys_command); |
| 10885 | defsubr (&Sw32_shell_execute); | 10877 | defsubr (&Sw32_shell_execute); |