1 files changed, 8 insertions, 27 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index b30a410f80e..d130b3b3d42 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1,5 +1,5 @@
 /* Execution of byte code produced by bytecomp.el.
-   Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -387,6 +387,7 @@ unmark_byte_stack ()
         Vquit_flag = Qnil;                              \
         BEFORE_POTENTIAL_GC ();                         \
         Fsignal (Qquit, Qnil);                          \
+        AFTER_POTENTIAL_GC ();                          \
       }                                                 \
   } while (0)
 
@@ -539,9 +540,7 @@ If the third argument is incorrect, Emacs may crash.  */)
               TOP = Qnil;
             else
               {
-                BEFORE_POTENTIAL_GC ();
-                Fcar (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
               }
             break;
           }
@@ -574,9 +573,7 @@ If the third argument is incorrect, Emacs may crash.  */)
               TOP = Qnil;
             else
               {
-                BEFORE_POTENTIAL_GC ();
-                Fcdr (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
               }
             break;
           }
@@ -907,11 +904,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                 else if (!NILP (v1))
                   {
                     immediate_quit = 0;
-                    BEFORE_POTENTIAL_GC ();
-                    v1 = wrong_type_argument (Qlistp, v1);
-                    AFTER_POTENTIAL_GC ();
-                    immediate_quit = 1;
-                    op++;
+                    wrong_type_argument (Qlistp, v1);
                   }
               }
             immediate_quit = 0;
@@ -920,11 +913,7 @@ If the third argument is incorrect, Emacs may crash.  */)
             else if (NILP (v1))
               TOP = Qnil;
             else
-              {
-                BEFORE_POTENTIAL_GC ();
-                Fcar (wrong_type_argument (Qlistp, v1));
-                AFTER_POTENTIAL_GC ();
-              }
+              wrong_type_argument (Qlistp, v1);
             break;
           }
 
@@ -1561,11 +1550,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                     else if (!NILP (v1))
                       {
                         immediate_quit = 0;
-                        BEFORE_POTENTIAL_GC ();
-                        v1 = wrong_type_argument (Qlistp, v1);
-                        AFTER_POTENTIAL_GC ();
-                        immediate_quit = 1;
-                        op++;
+                        wrong_type_argument (Qlistp, v1);
                       }
                   }
                 immediate_quit = 0;
@@ -1574,11 +1559,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                 else if (NILP (v1))
                   TOP = Qnil;
                 else
-                  {
-                    BEFORE_POTENTIAL_GC ();
-                    Fcar (wrong_type_argument (Qlistp, v1));
-                    AFTER_POTENTIAL_GC ();
-                  }
+                  wrong_type_argument (Qlistp, v1);
               }
             else
               {