Generalize INTERNAL_FIELD between buffers, keyboards and frames.

* src/lisp.h (INTERNAL_FIELD): New macro.
* src/buffer.h (BUFFER_INTERNAL_FIELD): Removed.
(BVAR): Change to use INTERNAL_FIELD.
* src/keyboard.h (KBOARD_INTERNAL_FIELD): Likewise.
(KVAR): Change to use INTERNAL_FIELD.
* src/frame.h (FVAR): New macro.
(struct frame): Use INTERNAL_FIELD for all Lisp_Object fields.
* src/alloc.c, src/buffer.c, src/data.c, src/dispnew.c, src/dosfns.c
* src/eval.c, src/frame.c, src/fringe.c, src/gtkutil.c, src/minibuf.c
* src/nsfns.m, src/nsterm.m, src/print.c, src/term.c, src/w32fns.c
* src/w32menu.c, src/w32term.c, src/window.c, src/window.h, src/xdisp.c
* src/xfaces.c, src/xfns.c, src/xmenu.c, src/xterm.c: Users changed.
* admin/coccinelle/frame.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct frame to FVAR.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 5b2553c69cc..f04f3c05134 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4424,7 +4424,7 @@ live_buffer_p (struct mem_node *m, void *p)
      must not have been killed.  */
   return (m->type == MEM_TYPE_BUFFER
           && p == m->start
-          && !NILP (((struct buffer *) p)->BUFFER_INTERNAL_FIELD (name)));
+          && !NILP (((struct buffer *) p)->INTERNAL_FIELD (name)));
 }
 
 #endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */
@@ -5549,10 +5549,10 @@ See Info node `(elisp)Garbage Collection'.  */)
          turned off in that buffer.  Calling truncate_undo_list on
          Qt tends to return NULL, which effectively turns undo back on.
          So don't call truncate_undo_list if undo_list is Qt.  */
-      if (! EQ (nextb->BUFFER_INTERNAL_FIELD (undo_list), Qt))
+      if (! EQ (nextb->INTERNAL_FIELD (undo_list), Qt))
         {
           Lisp_Object tail, prev;
-          tail = nextb->BUFFER_INTERNAL_FIELD (undo_list);
+          tail = nextb->INTERNAL_FIELD (undo_list);
           prev = Qnil;
           while (CONSP (tail))
             {
@@ -5561,7 +5561,7 @@ See Info node `(elisp)Garbage Collection'.  */)
                   && !XMARKER (XCAR (XCAR (tail)))->gcmarkbit)
                 {
                   if (NILP (prev))
-                    nextb->BUFFER_INTERNAL_FIELD (undo_list) = tail = XCDR (tail);
+                    nextb->INTERNAL_FIELD (undo_list) = tail = XCDR (tail);
                   else
                     {
                       tail = XCDR (tail);
@@ -5577,7 +5577,7 @@ See Info node `(elisp)Garbage Collection'.  */)
         }
       /* Now that we have stripped the elements that need not be in the
          undo_list any more, we can finally mark the list.  */
-      mark_object (nextb->BUFFER_INTERNAL_FIELD (undo_list));
+      mark_object (nextb->INTERNAL_FIELD (undo_list));
     }
 
   gc_sweep ();