--- a/src/buffer.c	Mon Aug 13 10:33:19 2007 +0200
+++ b/src/buffer.c	Mon Aug 13 10:34:13 2007 +0200
@@ -2243,9 +2243,8 @@
 #ifdef REGION_CACHE_NEEDS_WORK
     buffer_local_flags.cache_long_line_scans = make_int (0x2000);
 #endif
-    buffer_local_flags.buffer_file_type = make_int (0x4000);
 #ifdef FILE_CODING
-    buffer_local_flags.buffer_file_coding_system = make_int (0x8000);
+    buffer_local_flags.buffer_file_coding_system = make_int (0x4000);
 #endif
 
     /* #### Warning, 0x4000000 (that's six zeroes) is the largest number
@@ -2301,12 +2300,6 @@
 This is the same as (default-value 'case-fold-search).
 */ );
 
-  DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-type", buffer_file_type /*
-Default file type for buffers that do not override it.
-This is the same as (default-value 'buffer-file-type).
-The file type is nil for text, t for binary.
-*/ );
-
   DEFVAR_BUFFER_LOCAL ("modeline-format", modeline_format /*
 Template for displaying modeline for current buffer.
 Each buffer has its own value of this variable.
@@ -2444,12 +2437,6 @@
 Each buffer has its own value of this variable.
 */ );
 
-  DEFVAR_BUFFER_LOCAL ("buffer-file-type", buffer_file_type /*
-    "Non-nil if the visited file is a binary file.
-This variable is meaningful on MS-DOS and Windows NT.
-On those systems, it is automatically local in every buffer.
-On other systems, this variable is normally always nil.
-*/ );
 #ifdef FILE_CODING
   DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system", buffer_file_coding_system /*
 Default value of `buffer-file-coding-system' for buffers that do not override it.