diff options
| author | Miles Bader | 2005-06-06 02:39:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-06-06 02:39:45 +0000 |
| commit | fdffd346262841cb194225ea0acd8059c57ec2d4 (patch) | |
| tree | d8b3699131f7d1b94bc46c7d8be62af6b8b5ebfe /src/bytecode.c | |
| parent | a5c508fe3a3f456c987283156315d0384d38fe9e (diff) | |
| parent | a9b4333620eb259e974445066a8e64cee0c21d69 (diff) | |
| download | emacs-fdffd346262841cb194225ea0acd8059c57ec2d4.tar.gz emacs-fdffd346262841cb194225ea0acd8059c57ec2d4.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 324-352)
- Merge from gnus--rel--5.10
- Update from CVS
- etc/emacs-buffer.gdb: Remove RCS keywords
* gnus--rel--5.10 (patch 70-79)
- Update from CVS
- Merge from emacs--cvs-trunk--0
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index d130b3b3d42..80fb5e2208e 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -384,8 +384,11 @@ unmark_byte_stack () | |||
| 384 | do { \ | 384 | do { \ |
| 385 | if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ | 385 | if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ |
| 386 | { \ | 386 | { \ |
| 387 | Lisp_Object flag = Vquit_flag; \ | ||
| 387 | Vquit_flag = Qnil; \ | 388 | Vquit_flag = Qnil; \ |
| 388 | BEFORE_POTENTIAL_GC (); \ | 389 | BEFORE_POTENTIAL_GC (); \ |
| 390 | if (EQ (Vthrow_on_input, flag)) \ | ||
| 391 | Fthrow (Vthrow_on_input, Qnil); \ | ||
| 389 | Fsignal (Qquit, Qnil); \ | 392 | Fsignal (Qquit, Qnil); \ |
| 390 | AFTER_POTENTIAL_GC (); \ | 393 | AFTER_POTENTIAL_GC (); \ |
| 391 | } \ | 394 | } \ |