From: Kim F. Storm Date: Wed, 1 Jun 2005 11:42:19 +0000 (+0000) Subject: (mapcar1): Maybe exit loop if original sequence was modified. X-Git-Tag: emacs-pretest-22.0.90~9369 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=859463640aab206bbead70e359e5e480c8b11750;p=emacs.git (mapcar1): Maybe exit loop if original sequence was modified. --- diff --git a/src/fns.c b/src/fns.c index bd3893f7538..e910c87375b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3132,9 +3132,9 @@ mapcar1 (leni, vals, fn, seq) else /* Must be a list, since Flength did not get an error */ { tail = seq; - for (i = 0; i < leni; i++) + for (i = 0; i < leni && CONSP (tail); i++) { - dummy = call1 (fn, Fcar (tail)); + dummy = call1 (fn, XCAR (tail)); if (vals) vals[i] = dummy; tail = XCDR (tail); @@ -3172,7 +3172,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) mapcar1 (leni, args, function, sequence); UNGCPRO; - for (i = leni - 1; i >= 0; i--) + for (i = leni - 1; i > 0; i--) args[i + i] = args[i]; for (i = 1; i < nargs; i += 2)