[Emacs-diffs] /srv/bzr/emacs/trunk r103276: Fix the MS-Windows build due to introduction of B_.

[Eli Zaretskii]

------------------------------------------------------------
revno: 103276
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-14 19:35:21 +0200
message:
  Fix the MS-Windows build due to introduction of B_.
  
   dired.c (directory_files_internal):
   fileio.c (Finsert_file_contents):
   insdel.c (prepare_to_modify_buffer):
   xdisp.c (pos_visible_p):
   s/ms-w32.h (MODE_LINE_BINARY_TEXT):
   w32fns.c (Fw32_shell_execute, Fx_show_tip, x_create_tip_frame):
   Use B_ for the MS-Windows build.
  
   From Tom Tromey:
   buffer.c (init_buffer_once, syms_of_buffer): Use B_ in DOS_NT case.
modified:
  lisp/dired.el
  src/ChangeLog
  src/buffer.c
  src/dired.c
  src/fileio.c
  src/insdel.c
  src/s/ms-w32.h
  src/w32fns.c

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-02-13 00:16:28 +0000
+++ b/lisp/dired.el     2011-02-14 17:35:21 +0000
@@ -4029,7 +4029,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "fbac6ae123aaa2b2e9df8bb2cde61ceb")
+;;;;;;  "d35468f85920d324895b0c04bb703328")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-14 17:21:10 +0000
+++ b/src/ChangeLog     2011-02-14 17:35:21 +0000
@@ -1,3 +1,13 @@
+2011-02-14  Eli Zaretskii  <address@hidden>
+
+       * dired.c (directory_files_internal):
+       * fileio.c (Finsert_file_contents):
+       * insdel.c (prepare_to_modify_buffer):
+       * xdisp.c (pos_visible_p):
+       * s/ms-w32.h (MODE_LINE_BINARY_TEXT):
+       * w32fns.c (Fw32_shell_execute, Fx_show_tip, x_create_tip_frame):
+       Use B_ for the MS-Windows build.
+
 2011-02-14  Jan Djärv  <address@hidden>
 
        * xrdb.c (x_load_resources): For LUCID and XFT, don't put a
@@ -11,6 +21,8 @@
 
 2011-02-14  Tom Tromey  <address@hidden>
 
+       * buffer.c (init_buffer_once, syms_of_buffer): Use B_ in DOS_NT case.
+
        * keyboard.h: Remove obsolete comment.
 
 2011-02-14  Tom Tromey  <address@hidden>

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2011-02-14 15:39:19 +0000
+++ b/src/buffer.c      2011-02-14 17:35:21 +0000
@@ -5041,7 +5041,7 @@
   B_ (&buffer_defaults, cursor_in_non_selected_windows) = Qt;
 
 #ifdef DOS_NT
-  buffer_defaults.buffer_file_type = Qnil; /* TEXT */
+  B_ (&buffer_defaults, buffer_file_type) = Qnil; /* TEXT */
 #endif
   B_ (&buffer_defaults, enable_multibyte_characters) = Qt;
   B_ (&buffer_defaults, buffer_file_coding_system) = Qnil;
@@ -5113,7 +5113,7 @@
   XSETFASTINT (B_ (&buffer_local_flags, abbrev_table), idx); ++idx;
   XSETFASTINT (B_ (&buffer_local_flags, display_table), idx); ++idx;
 #ifdef DOS_NT
-  XSETFASTINT (buffer_local_flags.buffer_file_type, idx);
+  XSETFASTINT (B_ (&buffer_local_flags, buffer_file_type), idx);
   /* Make this one a permanent local.  */
   buffer_permanent_local_flags[idx++] = 1;
 #endif
@@ -5674,7 +5674,7 @@
 in narrower windows.  */);
 
 #ifdef DOS_NT
-  DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type,
+  DEFVAR_PER_BUFFER ("buffer-file-type", &B_ (current_buffer, 
buffer_file_type),
                     Qnil,
                     doc: /* Non-nil if the visited file is a binary file.
 This variable is meaningful on MS-DOG and Windows NT.

=== modified file 'src/dired.c'
--- a/src/dired.c       2011-02-07 01:18:31 +0000
+++ b/src/dired.c       2011-02-14 17:35:21 +0000
@@ -158,7 +158,7 @@
 # ifdef WINDOWSNT
       /* Windows users want case-insensitive wildcards.  */
       bufp = compile_pattern (match, 0,
-                             buffer_defaults.case_canon_table, 0, 1);
+                             B_ (&buffer_defaults, case_canon_table), 0, 1);
 # else /* !WINDOWSNT */
       bufp = compile_pattern (match, 0, Qnil, 0, 1);
 # endif         /* !WINDOWSNT */

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2011-02-14 15:39:19 +0000
+++ b/src/fileio.c      2011-02-14 17:35:21 +0000
@@ -4110,9 +4110,9 @@
   if ((VECTORP (CODING_ID_EOL_TYPE (coding.id))
        || EQ (CODING_ID_EOL_TYPE (coding.id), Qunix))
       && ! CODING_REQUIRE_DECODING (&coding))
-    current_buffer->buffer_file_type = Qt;
+    B_ (current_buffer, buffer_file_type) = Qt;
   else
-    current_buffer->buffer_file_type = Qnil;
+    B_ (current_buffer, buffer_file_type) = Qnil;
 #endif
 
  handled:

=== modified file 'src/insdel.c'
--- a/src/insdel.c      2011-02-14 15:39:19 +0000
+++ b/src/insdel.c      2011-02-14 17:35:21 +0000
@@ -2029,12 +2029,12 @@
     lock_file (B_ (base_buffer, file_truename));
 #else
   /* At least warn if this file has changed on disk since it was visited.  */
-  if (!NILP (base_buffer->filename)
+  if (!NILP (B_ (base_buffer, filename))
       && SAVE_MODIFF >= MODIFF
       && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
-      && !NILP (Ffile_exists_p (base_buffer->filename)))
+      && !NILP (Ffile_exists_p (B_ (base_buffer, filename))))
     call1 (intern ("ask-user-about-supersession-threat"),
-          base_buffer->filename);
+          B_ (base_buffer,filename));
 #endif /* not CLASH_DETECTION */
 
   /* If `select-active-regions' is non-nil, save the region text.  */

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2011-01-31 20:00:40 +0000
+++ b/src/s/ms-w32.h    2011-02-14 17:35:21 +0000
@@ -181,7 +181,7 @@
 #define HAVE_MENUS 1
 #endif
 
-#define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B")
+#define MODE_LINE_BINARY_TEXT(_b_) (NILP (B_(_b_,buffer_file_type)) ? "T" : 
"B")
 
 /* Get some redefinitions in place.  */
 

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-01-26 08:36:39 +0000
+++ b/src/w32fns.c      2011-02-14 17:35:21 +0000
@@ -5225,7 +5225,7 @@
   Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil);
   old_buffer = current_buffer;
   set_buffer_internal_1 (XBUFFER (buffer));
-  current_buffer->truncate_lines = Qnil;
+  B_ (current_buffer, truncate_lines) = Qnil;
   specbind (Qinhibit_read_only, Qt);
   specbind (Qinhibit_modification_hooks, Qt);
   Ferase_buffer ();
@@ -5655,7 +5655,7 @@
   /* Display the tooltip text in a temporary buffer.  */
   old_buffer = current_buffer;
   set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->buffer));
-  current_buffer->truncate_lines = Qnil;
+  B_ (current_buffer, truncate_lines) = Qnil;
   clear_glyph_matrix (w->desired_matrix);
   clear_glyph_matrix (w->current_matrix);
   SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
@@ -6162,7 +6162,7 @@
   CHECK_STRING (document);
 
   /* Encode filename, current directory and parameters.  */
-  current_dir = ENCODE_FILE (current_buffer->directory);
+  current_dir = ENCODE_FILE (B_ (current_buffer, directory));
   document = ENCODE_FILE (document);
   if (STRINGP (parameters))
     parameters = ENCODE_SYSTEM (parameters);