Merge from mainline.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 36cb5fe9dda..65c7168d60a 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -321,7 +321,7 @@ while (0)
 /* Return character at byte position POS.  */
 
 #define FETCH_CHAR(pos)                                 \
-  (!NILP (B_ (current_buffer, enable_multibyte_characters))     \
+  (!NILP (BVAR (current_buffer, enable_multibyte_characters))   \
    ? FETCH_MULTIBYTE_CHAR ((pos))                       \
    : FETCH_BYTE ((pos)))
 
@@ -346,7 +346,7 @@ extern unsigned char *_fetch_multibyte_char_p;
    multibyte.  */
 
 #define FETCH_CHAR_AS_MULTIBYTE(pos)                    \
-  (!NILP (B_ (current_buffer, enable_multibyte_characters))     \
+  (!NILP (BVAR (current_buffer, enable_multibyte_characters))   \
    ? FETCH_MULTIBYTE_CHAR ((pos))                       \
    : UNIBYTE_TO_CHAR (FETCH_BYTE ((pos))))
 
@@ -465,13 +465,13 @@ struct buffer_text
   };
 
 /* Lisp fields in struct buffer are hidden from most code and accessed
-   via the B_ macro, below.  Only select pieces of code, like the GC,
+   via the BVAR macro, below.  Only select pieces of code, like the GC,
    are allowed to use BUFFER_INTERNAL_FIELD.  */
 #define BUFFER_INTERNAL_FIELD(field) field ## _
 
 /* Most code should use this macro to access Lisp fields in struct
    buffer.  */
-#define B_(buf, field) ((buf)->BUFFER_INTERNAL_FIELD (field))
+#define BVAR(buf, field) ((buf)->BUFFER_INTERNAL_FIELD (field))
 
 /* This is the structure that the buffer Lisp object points to.  */
 
@@ -662,12 +662,6 @@ struct buffer
   Lisp_Object BUFFER_INTERNAL_FIELD (left_margin);
   /* Function to call when insert space past fill column.  */
   Lisp_Object BUFFER_INTERNAL_FIELD (auto_fill_function);
-  /* nil: text, t: binary.
-     This value is meaningful only on certain operating systems.  */
-  /* Actually, we don't need this flag any more because end-of-line
-     is handled correctly according to the buffer-file-coding-system
-     of the buffer.  Just keeping it for backward compatibility.  */
-  Lisp_Object BUFFER_INTERNAL_FIELD (buffer_file_type);
 
   /* Case table for case-conversion in this buffer.
      This char-table maps each char into its lower-case version.  */