mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 07:51:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/byte-switch

Browse source
This commit is contained in:
Vibhav Pant 2017-02-05 23:08:53 +05:30
commit ad70ca1dad
82 changed files with 3711 additions and 1427 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bytecode.c
View file

@ -843,11 +843,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;
}
@ -1277,11 +1277,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