2 files changed, 7 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e3a3137e482..c9ae55a30c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_.
+
 2011-02-14  Michael Welsh Duggan  <md5i@md5i.com>
 
         * print.c (float_to_string): Ensure that a decimal point is
diff --git a/src/nsfns.m b/src/nsfns.m
index f1bf8b65727..c480c834602 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -605,8 +605,8 @@ ns_set_name_as_filename (struct frame *f)
 
   BLOCK_INPUT;
   pool = [[NSAutoreleasePool alloc] init];
-  filename = XBUFFER (buf)->filename;
-  name = XBUFFER (buf)->name;
+  filename = B_ (XBUFFER (buf), filename);
+  name = B_ (XBUFFER (buf), name);
 
   if (NILP (name))
     {
@@ -1428,7 +1428,7 @@ Optional arg INIT, if non-nil, provides a default file name to use.  */)
   NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil :
     [NSString stringWithUTF8String: SDATA (prompt)];
   NSString *dirS = NILP (dir) || !STRINGP (dir) ?
-    [NSString stringWithUTF8String: SDATA (current_buffer->directory)] :
+    [NSString stringWithUTF8String: SDATA (B_ (current_buffer, directory))] :
     [NSString stringWithUTF8String: SDATA (dir)];
   NSString *initS = NILP (init) || !STRINGP (init) ? nil :
     [NSString stringWithUTF8String: SDATA (init)];