diff options
| author | Karoly Lorentey | 2005-11-07 14:56:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-11-07 14:56:19 +0000 |
| commit | 79c3172f78d56cf88c927fb0ff5c3b30fd676686 (patch) | |
| tree | 20932caaa9695f3bb29b543f46107319a687308d /src/bytecode.c | |
| parent | 9684e4c92f12f7c31f5e6fda7742960b403395f6 (diff) | |
| parent | fab0d3087eb5215a5d08379ac765af27abc28842 (diff) | |
| download | emacs-79c3172f78d56cf88c927fb0ff5c3b30fd676686.tar.gz emacs-79c3172f78d56cf88c927fb0ff5c3b30fd676686.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-629
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-630
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-631
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-632
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-633
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-634
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-635
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-636
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-637
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-638
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-639
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-640
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-641
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-149
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-437
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index e5a3e7b2a7c..e23d835cf10 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -861,11 +861,11 @@ If the third argument is incorrect, Emacs may crash. */) | |||
| 861 | 861 | ||
| 862 | case Bcondition_case: | 862 | case Bcondition_case: |
| 863 | { | 863 | { |
| 864 | Lisp_Object v1; | 864 | Lisp_Object handlers, body; |
| 865 | v1 = POP; | 865 | handlers = POP; |
| 866 | v1 = Fcons (POP, v1); | 866 | body = POP; |
| 867 | BEFORE_POTENTIAL_GC (); | 867 | BEFORE_POTENTIAL_GC (); |
| 868 | TOP = Fcondition_case (Fcons (TOP, v1)); | 868 | TOP = internal_lisp_condition_case (TOP, body, handlers); |
| 869 | AFTER_POTENTIAL_GC (); | 869 | AFTER_POTENTIAL_GC (); |
| 870 | break; | 870 | break; |
| 871 | } | 871 | } |