Merge branch 'master' into xwidget

1 files changed, 4 insertions, 6 deletions

diff --git a/src/window.c b/src/window.c
index d14a0f74fa0..b4230100150 100644
--- 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);
         }
     }