From 2f221583cf4a4b412c16260d148b59931b12455a Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Fri, 24 Aug 2012 20:11:12 -0700
Subject: * bytecode.c, callint.c, callproc.c: Use bool for boolean.

* bytecode.c (exec_byte_code):
* callint.c (check_mark, Fcall_interactively):
* callproc.c (Fcall_process, add_env, child_setup, getenv_internal_1)
(getenv_internal, sync_process_alive, call_process_exited):
* lisp.h (USE_SAFE_ALLOCA):
Use bool for booleans, instead of int.
* lisp.h, process.h: Adjust prototypes to match above changes.
* callint.c (Fcall_interactively): Don't assume the mark's
offset fits in 'int'.
---
 src/bytecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index 5ac8b4fa2bd..753f149ae01 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -553,7 +553,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);
-- 
cgit v1.2.1


From 66322887059e1f2711e07def5eff661281cee855 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Tue, 28 Aug 2012 10:20:08 +0400
Subject: Always use set_buffer_if_live to restore original buffer at unwind. *
 buffer.h (record_unwind_current_buffer): New function. * bytecode.c,
 dispnew.c, editfns.c, fileio.c, fns.c, insdel.c: * keyboard.c, keymap.c,
 minibuf.c, print.c, process.c, textprop.c: * undo.c, window.c: Adjust users.
 * buffer.c (set_buffer_if_live): Fix comment.

---
 src/bytecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index 753f149ae01..40729cbd453 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1051,7 +1051,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.  */
-- 
cgit v1.2.1