1 files changed, 4 insertions, 9 deletions

diff --git a/src/data.c b/src/data.c
index d1e43ac1b5f..9f4bd1f1c02 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);
@@ -1980,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;
       }