From 8f3a2c2659ddee1ae84b4b8bb28f6c388f87fd0f Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Mon, 5 Aug 2013 08:14:43 +0400
Subject: New macro to iterate over live buffers similar to frames. * buffer.h
 (FOR_EACH_LIVE_BUFFER): New macro. (Vbuffer_alist, Qpriority, Qbefore_string,
 Qafter_string): Declare buffer-related variables here to offload lisp.h. *
 buffer.c (Vbuffer_alist): Adjust comment. (Fget_file_buffer,
 get_truename_buffer, Fother_buffer) (other_buffer_safely): * data.c
 (store_symval_forwarding): * dispnew.c (Fframe_or_buffer_changed_p): *
 fileio.c (Fdo_auto_save): * filelock.c (unlock_all_files): * minibuf.c
 (read_minibuf): Use FOR_EACH_LIVE_BUFFER.

---
 src/data.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/data.c')

diff --git a/src/data.c b/src/data.c
index d1e43ac1b5f..ef3a6965779 100644
--- a/src/data.c
+++ b/src/data.c
@@ -981,19 +981,14 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
 			- (char *) &buffer_defaults);
 	  int idx = PER_BUFFER_IDX (offset);
 
-	  Lisp_Object tail;
+	  Lisp_Object tail, buf;
 
 	  if (idx <= 0)
 	    break;
 
-	  for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
+	  FOR_EACH_LIVE_BUFFER (tail, buf)
 	    {
-	      Lisp_Object lbuf;
-	      struct buffer *b;
-
-	      lbuf = Fcdr (XCAR (tail));
-	      if (!BUFFERP (lbuf)) continue;
-	      b = XBUFFER (lbuf);
+	      struct buffer *b = XBUFFER (buf);
 
 	      if (! PER_BUFFER_VALUE_P (b, idx))
 		set_per_buffer_value (b, offset, newval);
-- 
cgit v1.2.1


From d2a95ffb4eeed87b00c9ac1c8eec7d39b06226e5 Mon Sep 17 00:00:00 2001
From: Dmitry Antipov
Date: Wed, 7 Aug 2013 17:21:59 +0400
Subject: Prefer selected_window to Fselected_window, likewise for frames. *
 buffer.c (Fbuffer_swap_text): * data.c (Fvariable_binding_locus): * window.c
 (run_window_configuration_change_hook): Adjust users. * w16select.c
 (Fw16_set_clipboard_data, Fw16_get_clipboard_data): Use decode_live_frame.

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

(limited to 'src/data.c')

diff --git a/src/data.c b/src/data.c
index ef3a6965779..9f4bd1f1c02 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1975,7 +1975,7 @@ If the current binding is global (the default), the value is nil.  */)
       {
 	union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
 	if (KBOARD_OBJFWDP (valcontents))
-	  return Fframe_terminal (Fselected_frame ());
+	  return Fframe_terminal (selected_frame);
 	else if (!BUFFER_OBJFWDP (valcontents))
 	  return Qnil;
       }
-- 
cgit v1.2.1