Use new macro names for handling per-buffer variables.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ba06ba5dd30592d33680271698d59d3222d9246..a134ef1afd833417bab7286be2d3fa4b61955cdd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -27,7 +27,7 @@
 
        * xterm.h (x_specified_cursor_type, x_copy_color): Add prototypes.
 
-       * xfaces.c (register_color, unregister_colors, unregister_colors)
+       * xfaces.c (register_color, unregister_color, unregister_colors)
        [DEBUG_X_COLORS]: New functions.
        (x_free_colors) [DEBUG_X_COLORS]: Unregister colors.
 
@@ -47,8 +47,8 @@
        (PER_BUFFER_SYMBOL): Renamed from BUFFER_LOCAL_SYMBOL.
        (PER_BUFFER_TYPE): Renamed from BUFFER_LOCAL_TYPE.
 
-       * category.c, data.c, syntax.c, print.c: Use new macro names
-       for handling per-buffer variables.
+       * category.c, data.c, syntax.c, print.c, lread.c: Use new macro
+       names for handling per-buffer variables.
 
        * buffer.c (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
        instead of MAX_BUFFER_LOCAL_VARS.

diff --git a/src/lread.c b/src/lread.c
index 0eb7c486a3727a29f4cb93a919111409146b0eaf..02d6bbd3c37108bc234cb4764218e8aad4f5ca6e 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -3160,10 +3160,10 @@ defvar_per_buffer (namestring, address, type, doc)
   XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
   XBUFFER_OBJFWD (val)->offset = offset;
   XSYMBOL (sym)->value = val;
-  BUFFER_LOCAL_SYMBOL (offset) = sym;
-  BUFFER_LOCAL_TYPE (offset) = type;
+  PER_BUFFER_SYMBOL (offset) = sym;
+  PER_BUFFER_TYPE (offset) = type;
   
-  if (BUFFER_LOCAL_IDX (offset) == 0)
+  if (PER_BUFFER_IDX (offset) == 0)
     /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
        slot of buffer_local_flags */
     abort ();