aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2005-03-06 16:04:21 +0000
committerRichard M. Stallman2005-03-06 16:04:21 +0000
commit85d964de72af898cbcc9cac4ef0b11136de332ba (patch)
treef90219e7b33d3c80d1f137f9eeb48a3dd7520ad5 /src
parentc1788fbc8b4a07004713523e52350edbdc66ade3 (diff)
downloademacs-85d964de72af898cbcc9cac4ef0b11136de332ba.tar.gz
emacs-85d964de72af898cbcc9cac4ef0b11136de332ba.zip
(Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog17
-rw-r--r--src/keyboard.c5
2 files changed, 17 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dc48d647216..fc2ded6ce94 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
12005-03-06 Richard M. Stallman <rms@gnu.org>
2
3 * keyboard.c (Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
4
5 * eval.c (unwind_to_catch): Use UNBLOCK_INPUT_TO.
6 (Feval, Ffuncall): Use CHECK_CONS_LIST.
7
8 * lisp.h (CHECK_CONS_LIST): New macro (two definitions).
9
10 * blockinput.h (UNBLOCK_INPUT_TO): New macro.
11 (TOTALLY_UNBLOCK_INPUT): Handle a pending signal if any.
12
12005-03-05 Juri Linkov <juri@jurta.org> 132005-03-05 Juri Linkov <juri@jurta.org>
2 14
3 * emacs.c (USAGE1): Replace Info node name "command arguments" 15 * emacs.c (USAGE1): Replace Info node name "command arguments"
@@ -107,6 +119,11 @@
107 119
108 * keyboard.c (Fposn_at_x_y): Check integerness of X and Y. 120 * keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
109 121
1222005-02-27 Richard M. Stallman <rms@gnu.org>
123
124 * xdisp.c (fast_find_position): Rename END to BEG.
125 (syms_of_xdisp) <menu-bar-update-hook>: Doc fix.
126
1102005-02-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 1272005-02-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
111 128
112 * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to 129 * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
diff --git a/src/keyboard.c b/src/keyboard.c
index 4fb8206d5ee..f507ea348f1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1350,11 +1350,6 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
1350 cancel_hourglass (); 1350 cancel_hourglass ();
1351#endif 1351#endif
1352 1352
1353 /* Unblock input if we enter with input blocked. This may happen if
1354 redisplay traps e.g. during tool-bar update with input blocked. */
1355 while (INPUT_BLOCKED_P)
1356 UNBLOCK_INPUT;
1357
1358 return Fthrow (Qtop_level, Qnil); 1353 return Fthrow (Qtop_level, Qnil);
1359} 1354}
1360 1355