Merge from trunk

1 files changed, 42 insertions, 43 deletions

diff --git a/src/data.c b/src/data.c
index e6342caadf1..fa40f14ccba 100644
--- a/src/data.c
+++ b/src/data.c
@@ -580,7 +580,7 @@ DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
         else
           {
             swap_in_symval_forwarding (sym, blv);
-            valcontents = BLV_VALUE (blv);
+            valcontents = blv_value (blv);
           }
         break;
       }
@@ -884,7 +884,7 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents)
       return *XOBJFWD (valcontents)->objvar;
 
     case Lisp_Fwd_Buffer_Obj:
-      return PER_BUFFER_VALUE (current_buffer,
+      return per_buffer_value (current_buffer,
                                XBUFFER_OBJFWD (valcontents)->offset);
 
     case Lisp_Fwd_Kboard_Obj:
@@ -956,7 +956,7 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
               b = XBUFFER (lbuf);
 
               if (! PER_BUFFER_VALUE_P (b, idx))
-                PER_BUFFER_VALUE (b, offset) = newval;
+                set_per_buffer_value (b, offset, newval);
             }
         }
       break;
@@ -974,7 +974,7 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
 
         if (buf == NULL)
           buf = current_buffer;
-        PER_BUFFER_VALUE (buf, offset) = newval;
+        set_per_buffer_value (buf, offset, newval);
       }
       break;
 
@@ -1001,16 +1001,16 @@ swap_in_global_binding (struct Lisp_Symbol *symbol)
 
   /* Unload the previously loaded binding.  */
   if (blv->fwd)
-    SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
+    set_blv_value (blv, do_symval_forwarding (blv->fwd));
 
   /* Select the global binding in the symbol.  */
-  blv->valcell = blv->defcell;
+  set_blv_valcell (blv, blv->defcell);
   if (blv->fwd)
     store_symval_forwarding (blv->fwd, XCDR (blv->defcell), NULL);
 
   /* Indicate that the global binding is set up now.  */
-  blv->where = Qnil;
-  SET_BLV_FOUND (blv, 0);
+  set_blv_where (blv, Qnil);
+  set_blv_found (blv, 0);
 }
 
 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer.
@@ -1038,7 +1038,7 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
       /* Unload the previously loaded binding.  */
       tem1 = blv->valcell;
       if (blv->fwd)
-        SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
+        set_blv_value (blv, do_symval_forwarding (blv->fwd));
       /* Choose the new binding.  */
       {
         Lisp_Object var;
@@ -1046,7 +1046,7 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
         if (blv->frame_local)
           {
             tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist);
-            blv->where = selected_frame;
+            set_blv_where (blv, selected_frame);
           }
         else
           {
@@ -1058,9 +1058,9 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
         tem1 = blv->defcell;
 
       /* Load the new binding.  */
-      blv->valcell = tem1;
+      set_blv_valcell (blv, tem1);
       if (blv->fwd)
-        store_symval_forwarding (blv->fwd, BLV_VALUE (blv), NULL);
+        store_symval_forwarding (blv->fwd, blv_value (blv), NULL);
     }
 }
 
@@ -1087,7 +1087,7 @@ find_symbol_value (Lisp_Object symbol)
       {
         struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
         swap_in_symval_forwarding (sym, blv);
-        return blv->fwd ? do_symval_forwarding (blv->fwd) : BLV_VALUE (blv);
+        return blv->fwd ? do_symval_forwarding (blv->fwd) : blv_value (blv);
       }
       /* FALLTHROUGH */
     case SYMBOL_FORWARDED:
@@ -1212,7 +1212,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
 
             /* Write out `realvalue' to the old loaded binding.  */
             if (blv->fwd)
-              SET_BLV_VALUE (blv, do_symval_forwarding (blv->fwd));
+              set_blv_value (blv, do_symval_forwarding (blv->fwd));
 
             /* Find the new binding.  */
             XSETSYMBOL (symbol, sym); /* May have changed via aliasing.  */
@@ -1220,7 +1220,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
                           (blv->frame_local
                            ? XFRAME (where)->param_alist
                            : BVAR (XBUFFER (where), local_var_alist)));
-            blv->where = where;
+            set_blv_where (blv, where);
             blv->found = 1;
 
             if (NILP (tem1))
@@ -1250,17 +1250,18 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
                        bindings, not for frame-local bindings.  */
                     eassert (!blv->frame_local);
                     tem1 = Fcons (symbol, XCDR (blv->defcell));
-                    BSET (XBUFFER (where), local_var_alist,
-                          Fcons (tem1, BVAR (XBUFFER (where), local_var_alist)));
+                    bset_local_var_alist
+                      (XBUFFER (where),
+                       Fcons (tem1, BVAR (XBUFFER (where), local_var_alist)));
                   }
               }
 
             /* Record which binding is now loaded.  */
-            blv->valcell = tem1;
+            set_blv_valcell (blv, tem1);
           }
 
         /* Store the new value in the cons cell.  */
-        SET_BLV_VALUE (blv, newval);
+        set_blv_value (blv, newval);
 
         if (blv->fwd)
           {
@@ -1345,7 +1346,7 @@ default_value (Lisp_Object symbol)
           {
             int offset = XBUFFER_OBJFWD (valcontents)->offset;
             if (PER_BUFFER_IDX (offset) != 0)
-              return PER_BUFFER_DEFAULT (offset);
+              return per_buffer_default (offset);
           }
 
         /* For other variables, get the current value.  */
@@ -1432,7 +1433,7 @@ for this variable.  */)
             int offset = XBUFFER_OBJFWD (valcontents)->offset;
             int idx = PER_BUFFER_IDX (offset);
 
-            PER_BUFFER_DEFAULT (offset) = value;
+            set_per_buffer_default (offset, value);
 
             /* If this variable is not always local in all buffers,
                set it in the buffers that don't nominally have a local value.  */
@@ -1442,7 +1443,7 @@ for this variable.  */)
 
                 FOR_EACH_BUFFER (b)
                   if (!PER_BUFFER_VALUE_P (b, idx))
-                    PER_BUFFER_VALUE (b, offset) = value;
+                    set_per_buffer_value (b, offset, value);
               }
             return value;
           }
@@ -1516,12 +1517,12 @@ make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents
   eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd)));
   eassert (!(forwarded && KBOARD_OBJFWDP (valcontents.fwd)));
   blv->fwd = forwarded ? valcontents.fwd : NULL;
-  blv->where = Qnil;
+  set_blv_where (blv, Qnil);
   blv->frame_local = 0;
   blv->local_if_set = 0;
-  blv->defcell = tem;
-  blv->valcell = tem;
-  SET_BLV_FOUND (blv, 0);
+  set_blv_defcell (blv, tem);
+  set_blv_valcell (blv, tem);
+  set_blv_found (blv, 0);
   return blv;
 }
 
@@ -1690,17 +1691,16 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
          default value.  */
       find_symbol_value (variable);
 
-      BSET (current_buffer, local_var_alist,
-            Fcons (Fcons (variable, XCDR (blv->defcell)),
-                   BVAR (current_buffer, local_var_alist)));
+      bset_local_var_alist
+        (current_buffer,
+         Fcons (Fcons (variable, XCDR (blv->defcell)),
+                BVAR (current_buffer, local_var_alist)));
 
       /* Make sure symbol does not think it is set up for this buffer;
          force it to look once again for this buffer's value.  */
       if (current_buffer == XBUFFER (blv->where))
-        blv->where = Qnil;
-      /* blv->valcell = blv->defcell;
-       * SET_BLV_FOUND (blv, 0); */
-      blv->found = 0;
+        set_blv_where (blv, Qnil);
+      set_blv_found (blv, 0);
     }
 
   /* If the symbol forwards into a C variable, then load the binding
@@ -1742,8 +1742,8 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
             if (idx > 0)
               {
                 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0);
-                PER_BUFFER_VALUE (current_buffer, offset)
-                  = PER_BUFFER_DEFAULT (offset);
+                set_per_buffer_value (current_buffer, offset,
+                                      per_buffer_default (offset));
               }
           }
         return variable;
@@ -1760,8 +1760,9 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
   XSETSYMBOL (variable, sym);   /* Propagate variable indirection.  */
   tem = Fassq (variable, BVAR (current_buffer, local_var_alist));
   if (!NILP (tem))
-    BSET (current_buffer, local_var_alist,
-          Fdelq (tem, BVAR (current_buffer, local_var_alist)));
+    bset_local_var_alist
+      (current_buffer,
+       Fdelq (tem, BVAR (current_buffer, local_var_alist)));
 
   /* If the symbol is set up with the current buffer's binding
      loaded, recompute its value.  We have to do it now, or else
@@ -1770,9 +1771,7 @@ From now on the default value will apply in this buffer.  Return VARIABLE.  */)
     Lisp_Object buf; XSETBUFFER (buf, current_buffer);
     if (EQ (buf, blv->where))
       {
-        blv->where = Qnil;
-        /* blv->valcell = blv->defcell;
-         * SET_BLV_FOUND (blv, 0); */
+        set_blv_where (blv, Qnil);
         blv->found = 0;
         find_symbol_value (variable);
       }
@@ -1894,11 +1893,11 @@ BUFFER defaults to the current buffer.  */)
             if (EQ (variable, XCAR (elt)))
               {
                 eassert (!blv->frame_local);
-                eassert (BLV_FOUND (blv) || !EQ (blv->where, tmp));
+                eassert (blv_found (blv) || !EQ (blv->where, tmp));
                 return Qt;
               }
           }
-        eassert (!BLV_FOUND (blv) || !EQ (blv->where, tmp));
+        eassert (!blv_found (blv) || !EQ (blv->where, tmp));
         return Qnil;
       }
     case SYMBOL_FORWARDED:
@@ -1988,7 +1987,7 @@ If the current binding is global (the default), the value is nil.  */)
       if (!NILP (Flocal_variable_p (variable, Qnil)))
         return Fcurrent_buffer ();
       else if (sym->redirect == SYMBOL_LOCALIZED
-               && BLV_FOUND (SYMBOL_BLV (sym)))
+               && blv_found (SYMBOL_BLV (sym)))
         return SYMBOL_BLV (sym)->where;
       else
         return Qnil;