merge from trunk

1 files changed, 9 insertions, 10 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index f186f7d1bc3..1be3e5c6188 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -569,9 +569,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           if (nargs < mandatory)
             /* Too few arguments.  */
             Fsignal (Qwrong_number_of_arguments,
-                     Fcons (Fcons (make_number (mandatory),
+                     list2 (Fcons (make_number (mandatory),
                                    rest ? Qand_rest : make_number (nonrest)),
-                            Fcons (make_number (nargs), Qnil)));
+                            make_number (nargs)));
           else
             {
               for (; i < nonrest; i++)
@@ -590,9 +590,8 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
       else
         /* Too many arguments.  */
         Fsignal (Qwrong_number_of_arguments,
-                 Fcons (Fcons (make_number (mandatory),
-                               make_number (nonrest)),
-                        Fcons (make_number (nargs), Qnil)));
+                 list2 (Fcons (make_number (mandatory), make_number (nonrest)),
+                        make_number (nargs)));
     }
   else if (! NILP (args_template))
     /* We should push some arguments on the stack.  */
@@ -1061,8 +1060,8 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 
         CASE (Bsave_window_excursion): /* Obsolete since 24.1.  */
           {
-            register ptrdiff_t count1 = SPECPDL_INDEX ();
-            record_unwind_protect (Fset_window_configuration,
+            ptrdiff_t count1 = SPECPDL_INDEX ();
+            record_unwind_protect (restore_window_configuration,
                                    Fcurrent_window_configuration (Qnil));
             BEFORE_POTENTIAL_GC ();
             TOP = Fprogn (TOP);
@@ -1087,7 +1086,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           }
 
         CASE (Bunwind_protect): /* FIXME: avoid closure for lexbind.  */
-          record_unwind_protect (Fprogn, POP);
+          record_unwind_protect (unwind_body, POP);
           NEXT;
 
         CASE (Bcondition_case): /* FIXME: ill-suited for lexbind.  */
@@ -1169,14 +1168,14 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           }
 
         CASE (Blist1):
-          TOP = Fcons (TOP, Qnil);
+          TOP = list1 (TOP);
           NEXT;
 
         CASE (Blist2):
           {
             Lisp_Object v1;
             v1 = POP;
-            TOP = Fcons (TOP, Fcons (v1, Qnil));
+            TOP = list2 (TOP, v1);
             NEXT;
           }