aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2002-07-16 13:42:15 +0000
committerRichard M. Stallman2002-07-16 13:42:15 +0000
commit160552c5274a64f865629329940ea1ea7811257a (patch)
tree91f9fcba7a5a2a87d040d1c5efcc75931e67294d /src
parent2af70a0cffcb27f56ed7ed1b3e8d3fd548b081ef (diff)
downloademacs-160552c5274a64f865629329940ea1ea7811257a.tar.gz
emacs-160552c5274a64f865629329940ea1ea7811257a.zip
(cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 26c1e8ffddb..9fea4df7538 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1121,6 +1121,11 @@ cmd_error (data)
1121 Lisp_Object old_level, old_length; 1121 Lisp_Object old_level, old_length;
1122 char macroerror[50]; 1122 char macroerror[50];
1123 1123
1124#ifdef HAVE_X_WINDOWS
1125 if (display_hourglass_p)
1126 cancel_hourglass ();
1127#endif
1128
1124 if (!NILP (executing_macro)) 1129 if (!NILP (executing_macro))
1125 { 1130 {
1126 if (executing_macro_iterations == 1) 1131 if (executing_macro_iterations == 1)