merge from trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index d61e37d7886..be5b7ea6137 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -550,7 +550,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
   if (INTEGERP (args_template))
     {
       ptrdiff_t at = XINT (args_template);
-      int rest = at & 128;
+      bool rest = (at & 128) != 0;
       int mandatory = at & 127;
       ptrdiff_t nonrest = at >> 8;
       eassert (mandatory <= nonrest);
@@ -1048,7 +1048,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 
         CASE (Bsave_current_buffer): /* Obsolete since ??.  */
         CASE (Bsave_current_buffer_1):
-          record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
+          record_unwind_current_buffer ();
           NEXT;
 
         CASE (Bsave_window_excursion): /* Obsolete since 24.1.  */