Merge branch 'master' into comment-cachecomment-cache

1 files changed, 11 insertions, 11 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index a64bc171d14..0f7420c19ee 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -679,7 +679,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
             {
               quitcounter = 1;
               maybe_gc ();
-              QUIT;
+              maybe_quit ();
             }
           pc += op;
           NEXT;
@@ -841,11 +841,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           {
             Lisp_Object v2 = POP, v1 = TOP;
             CHECK_NUMBER (v1);
-            EMACS_INT n = XINT (v1);
-            immediate_quit = true;
-            while (--n >= 0 && CONSP (v2))
-              v2 = XCDR (v2);
-            immediate_quit = false;
+            for (EMACS_INT n = XINT (v1); 0 < n && CONSP (v2); n--)
+              {
+                v2 = XCDR (v2);
+                rarely_quit (n);
+              }
             TOP = CAR (v2);
             NEXT;
           }
@@ -1275,11 +1275,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
                 /* Exchange args and then do nth.  */
                 Lisp_Object v2 = POP, v1 = TOP;
                 CHECK_NUMBER (v2);
-                EMACS_INT n = XINT (v2);
-                immediate_quit = true;
-                while (--n >= 0 && CONSP (v1))
-                  v1 = XCDR (v1);
-                immediate_quit = false;
+                for (EMACS_INT n = XINT (v2); 0 < n && CONSP (v1); n--)
+                  {
+                    v1 = XCDR (v1);
+                    rarely_quit (n);
+                  }
                 TOP = CAR (v1);
               }
             else