Merge from mainline.

[gnu-emacs] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index 2b2f61bbda4532f7fd4e7022fde54acecada7c35..0efadd675b0b4ede0016abc9ae8e530383dfbebb 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1882,7 +1882,7 @@ extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int);
 #define DEFVAR_BUFFER_DEFAULTS(lname, vname, doc)              \
   do {                                                         \
     static struct Lisp_Objfwd o_fwd;                           \
-    defvar_lisp_nopro (&o_fwd, lname, &buffer_defaults.vname); \
+    defvar_lisp_nopro (&o_fwd, lname, &buffer_defaults.vname ## _);    \
   } while (0)
 
 #define DEFVAR_KBOARD(lname, vname, doc)                       \
@@ -2047,11 +2047,11 @@ extern Lisp_Object case_temp2;
 
 /* Current buffer's map from characters to lower-case characters.  */
 
-#define DOWNCASE_TABLE current_buffer->downcase_table
+#define DOWNCASE_TABLE B_ (current_buffer, downcase_table)
 
 /* Current buffer's map from characters to upper-case characters.  */
 
-#define UPCASE_TABLE current_buffer->upcase_table
+#define UPCASE_TABLE B_ (current_buffer, upcase_table)
 
 /* Downcase a character, or make no change if that cannot be done.  */