From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 27 Mar 2000 19:55:38 +0000 (+0000)
Subject: Use new macro names for handling per-buffer variables.
X-Git-Tag: emacs-pretest-21.0.90~4450
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11fd416e9fae8fe2877a58e9770da7738065f61e;p=emacs.git

Use new macro names for handling per-buffer variables.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ba06ba5dd3..a134ef1afd8 100644
--- 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 0eb7c486a37..02d6bbd3c37 100644
--- 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 ();