[Emacs-diffs] trunk r113591: * frame.c (Fmodify_frame_parameters): Always check 2nd arg with

[Dmitry Antipov]

------------------------------------------------------------
revno: 113591
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 08:35:44 +0400
message:
  * frame.c (Fmodify_frame_parameters): Always check 2nd arg with
  CHECK_LIST.  Rewrite the loop to avoid useless local variable.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-29 17:28:07 +0000
+++ b/src/ChangeLog     2013-07-30 04:35:44 +0000
@@ -1,3 +1,8 @@
+2013-07-30  Dmitry Antipov  <address@hidden>
+
+       * frame.c (Fmodify_frame_parameters): Always check 2nd arg with
+       CHECK_LIST.  Rewrite the loop to avoid useless local variable.
+
 2013-07-29  Dmitry Antipov  <address@hidden>
 
        * fns.c (toplevel): Remove comment before Fsafe_length because

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-07-28 19:36:23 +0000
+++ b/src/frame.c       2013-07-30 04:35:44 +0000
@@ -2253,7 +2253,9 @@
   (Lisp_Object frame, Lisp_Object alist)
 {
   struct frame *f = decode_live_frame (frame);
-  register Lisp_Object tail, prop, val;
+  register Lisp_Object prop, val;
+
+  CHECK_LIST (alist);
 
   /* I think this should be done with a hook.  */
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2278,12 +2280,11 @@
 
       /* Extract parm names and values into those vectors.  */
 
-      i = 0;
-      for (tail = alist; CONSP (tail); tail = XCDR (tail))
+      for (i = 0; CONSP (alist); alist = XCDR (alist))
        {
          Lisp_Object elt;
 
-         elt = XCAR (tail);
+         elt = XCAR (alist);
          parms[i] = Fcar (elt);
          values[i] = Fcdr (elt);
          i++;