diff options
| author | Gerd Moellmann | 2000-11-29 12:21:15 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-11-29 12:21:15 +0000 |
| commit | 346598f1e5a3a76cffa6e31e049a83f9b6edcbe0 (patch) | |
| tree | b3ae9c17a4e37fef8d568844675fab67ada00043 /src | |
| parent | 9c6a4107e4a87211f4598745a340d3a536b71c9f (diff) | |
| download | emacs-346598f1e5a3a76cffa6e31e049a83f9b6edcbe0.tar.gz emacs-346598f1e5a3a76cffa6e31e049a83f9b6edcbe0.zip | |
(Fsignal): Reset handling_signal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/eval.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4cb63cb61a6..0126808493a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-11-29 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * eval.c (Fsignal): Reset handling_signal. | ||
| 4 | |||
| 1 | 2000-11-28 Jason Rumney <jasonr@gnu.org> | 5 | 2000-11-28 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * w32menu.c (add_menu_item): Reset menu item text when changing | 7 | * w32menu.c (add_menu_item): Reset menu item text when changing |
| @@ -5,7 +9,7 @@ | |||
| 5 | 9 | ||
| 6 | 2000-11-28 Gerd Moellmann <gerd@gnu.org> | 10 | 2000-11-28 Gerd Moellmann <gerd@gnu.org> |
| 7 | 11 | ||
| 8 | * xselect.c (wait_for_property_change): Update copyright. | 12 | * xselect.c: Update copyright. |
| 9 | 13 | ||
| 10 | * window.c (coordinates_in_window): If on a mode or header line, | 14 | * window.c (coordinates_in_window): If on a mode or header line, |
| 11 | but sufficiently close to its start, return ``on vertical | 15 | but sufficiently close to its start, return ``on vertical |
diff --git a/src/eval.c b/src/eval.c index f42ebc6979b..54ca9eb24b1 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1349,7 +1349,7 @@ See also the function `condition-case'.") | |||
| 1349 | extern int display_busy_cursor_p; | 1349 | extern int display_busy_cursor_p; |
| 1350 | struct backtrace *bp; | 1350 | struct backtrace *bp; |
| 1351 | 1351 | ||
| 1352 | immediate_quit = 0; | 1352 | immediate_quit = handling_signal = 0; |
| 1353 | if (gc_in_progress || waiting_for_input) | 1353 | if (gc_in_progress || waiting_for_input) |
| 1354 | abort (); | 1354 | abort (); |
| 1355 | 1355 | ||