Drop FGET and revert read access to Lisp_Objects slots of struct frame.

[bpt/emacs.git] / src / data.c

diff --git a/src/data.c b/src/data.c
index f5942a8..3a8e0b1 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -1006,7 +1006,7 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
        XSETSYMBOL (var, symbol);
        if (blv->frame_local)
          {
-           tem1 = assq_no_quit (var, FVAR (XFRAME (selected_frame), param_alist));
+           tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist);
            blv->where = selected_frame;
          }
        else
@@ -1179,7 +1179,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
            XSETSYMBOL (symbol, sym); /* May have changed via aliasing.  */
            tem1 = Fassq (symbol,
                          (blv->frame_local
-                          ? FVAR (XFRAME (where), param_alist)
+                          ? XFRAME (where)->param_alist
                           : BVAR (XBUFFER (where), local_var_alist)));
            blv->where = where;
            blv->found = 1;