aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-02-15 05:57:00 +0200
committerEli Zaretskii2011-02-15 05:57:00 +0200
commit8017fd6b81ed07c1ff3adf7494c867f9a2b034a9 (patch)
treed38eddb9e9bf7cbfa10340932a88dfd0acd84232
parent75b43359dd68edd356d9f611ebc3dd5b477fa637 (diff)
downloademacs-8017fd6b81ed07c1ff3adf7494c867f9a2b034a9.tar.gz
emacs-8017fd6b81ed07c1ff3adf7494c867f9a2b034a9.zip
Fix the NS build due to introduction of B_.
nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfns.m6
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 @@
12011-02-15 Eli Zaretskii <eliz@gnu.org>
2
3 * nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_.
4
12011-02-14 Michael Welsh Duggan <md5i@md5i.com> 52011-02-14 Michael Welsh Duggan <md5i@md5i.com>
2 6
3 * print.c (float_to_string): Ensure that a decimal point is 7 * 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)
605 605
606 BLOCK_INPUT; 606 BLOCK_INPUT;
607 pool = [[NSAutoreleasePool alloc] init]; 607 pool = [[NSAutoreleasePool alloc] init];
608 filename = XBUFFER (buf)->filename; 608 filename = B_ (XBUFFER (buf), filename);
609 name = XBUFFER (buf)->name; 609 name = B_ (XBUFFER (buf), name);
610 610
611 if (NILP (name)) 611 if (NILP (name))
612 { 612 {
@@ -1428,7 +1428,7 @@ Optional arg INIT, if non-nil, provides a default file name to use. */)
1428 NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil : 1428 NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil :
1429 [NSString stringWithUTF8String: SDATA (prompt)]; 1429 [NSString stringWithUTF8String: SDATA (prompt)];
1430 NSString *dirS = NILP (dir) || !STRINGP (dir) ? 1430 NSString *dirS = NILP (dir) || !STRINGP (dir) ?
1431 [NSString stringWithUTF8String: SDATA (current_buffer->directory)] : 1431 [NSString stringWithUTF8String: SDATA (B_ (current_buffer, directory))] :
1432 [NSString stringWithUTF8String: SDATA (dir)]; 1432 [NSString stringWithUTF8String: SDATA (dir)];
1433 NSString *initS = NILP (init) || !STRINGP (init) ? nil : 1433 NSString *initS = NILP (init) || !STRINGP (init) ? nil :
1434 [NSString stringWithUTF8String: SDATA (init)]; 1434 [NSString stringWithUTF8String: SDATA (init)];