Merge branch 'master' into xwidget

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index d14a0f74fa01d24f973599851c6a24853af60974..b4230100150af067984f30f1ffcfdd7c467742b7 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2429,16 +2429,14 @@ window_list (void)
       Vwindow_list = Qnil;
       FOR_EACH_FRAME (tail, frame)
        {
-         Lisp_Object args[2];
+         Lisp_Object arglist = Qnil;
 
          /* We are visiting windows in canonical order, and add
             new windows at the front of args[1], which means we
             have to reverse this list at the end.  */
-         args[1] = Qnil;
-         foreach_window (XFRAME (frame), add_window_to_list, &args[1]);
-         args[0] = Vwindow_list;
-         args[1] = Fnreverse (args[1]);
-         Vwindow_list = Fnconc (2, args);
+         foreach_window (XFRAME (frame), add_window_to_list, &arglist);
+         arglist = Fnreverse (arglist);
+         Vwindow_list = CALLN (Fnconc, Vwindow_list, arglist);
        }
     }