diff options
| author | Richard M. Stallman | 1994-11-24 08:40:21 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-11-24 08:40:21 +0000 |
| commit | 3ef14e464b3ca838872a99bfb6a991b4d966a3e0 (patch) | |
| tree | 208d275efb78afdcf15645c682dcd11e75dea275 /src | |
| parent | e6d63effab89e9d13dd47feb6bbce5f1b6fbd52f (diff) | |
| download | emacs-3ef14e464b3ca838872a99bfb6a991b4d966a3e0.tar.gz emacs-3ef14e464b3ca838872a99bfb6a991b4d966a3e0.zip | |
(command_loop_1): Use safe_run_hooks to run
deferred-action-function.
(Qdeferred_action_function): New variable.
(syms_of_keyboard): Initialize and staticpro Qdeferred_action_function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index aef4f1dc97a..4b1c6319737 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -310,6 +310,7 @@ Lisp_Object Vdeferred_action_list; | |||
| 310 | 310 | ||
| 311 | /* Function to call to handle deferred actions, when there are any. */ | 311 | /* Function to call to handle deferred actions, when there are any. */ |
| 312 | Lisp_Object Vdeferred_action_function; | 312 | Lisp_Object Vdeferred_action_function; |
| 313 | Lisp_Object Qdeferred_action_function; | ||
| 313 | 314 | ||
| 314 | /* File in which we write all commands we read. */ | 315 | /* File in which we write all commands we read. */ |
| 315 | FILE *dribble; | 316 | FILE *dribble; |
| @@ -1261,7 +1262,7 @@ command_loop_1 () | |||
| 1261 | safe_run_hooks (Qpost_command_hook); | 1262 | safe_run_hooks (Qpost_command_hook); |
| 1262 | 1263 | ||
| 1263 | if (!NILP (Vdeferred_action_list)) | 1264 | if (!NILP (Vdeferred_action_list)) |
| 1264 | call0 (Vdeferred_action_function); | 1265 | safe_run_hooks (Qdeferred_action_function); |
| 1265 | 1266 | ||
| 1266 | /* If there is a prefix argument, | 1267 | /* If there is a prefix argument, |
| 1267 | 1) We don't want last_command to be ``universal-argument'' | 1268 | 1) We don't want last_command to be ``universal-argument'' |
| @@ -6078,6 +6079,9 @@ syms_of_keyboard () | |||
| 6078 | Qpost_command_hook = intern ("post-command-hook"); | 6079 | Qpost_command_hook = intern ("post-command-hook"); |
| 6079 | staticpro (&Qpost_command_hook); | 6080 | staticpro (&Qpost_command_hook); |
| 6080 | 6081 | ||
| 6082 | Qdeferred_action_function = intern ("deferred-action-function"); | ||
| 6083 | staticpro (&Qdeferred_action_function); | ||
| 6084 | |||
| 6081 | Qcommand_hook_internal = intern ("command-hook-internal"); | 6085 | Qcommand_hook_internal = intern ("command-hook-internal"); |
| 6082 | staticpro (&Qcommand_hook_internal); | 6086 | staticpro (&Qcommand_hook_internal); |
| 6083 | 6087 | ||