[Emacs-diffs] /srv/bzr/emacs/trunk r103315: Fix KVAR/BVAR,

[Jan D.]

------------------------------------------------------------
revno: 103315
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-17 11:19:29 +0100
message:
  Fix KVAR/BVAR,
  
  * nsfns.m (Fx_create_frame, ns_set_name_as_filename)
  (Fns_read_file_name): Replace B_ with BVAR.
  
  * nsterm.m (ns_term_init): Use KVAR.
modified:
  src/ChangeLog
  src/nsfns.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-16 19:09:20 +0000
+++ b/src/ChangeLog     2011-02-17 10:19:29 +0000
@@ -1,3 +1,10 @@
+2011-02-17  Jan Djärv  <address@hidden>
+
+       * nsfns.m (Fx_create_frame, ns_set_name_as_filename)
+       (Fns_read_file_name): Replace B_ with BVAR.
+
+       * nsterm.m (ns_term_init): Use KVAR.
+
 2011-02-16  Eli Zaretskii  <address@hidden>
 
        * msdos.c (internal_terminal_init): Use KVAR.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2011-02-15 03:57:00 +0000
+++ b/src/nsfns.m       2011-02-17 10:19:29 +0000
@@ -605,8 +605,8 @@
 
   BLOCK_INPUT;
   pool = [[NSAutoreleasePool alloc] init];
-  filename = B_ (XBUFFER (buf), filename);
-  name = B_ (XBUFFER (buf), name);
+  filename = BVAR (XBUFFER (buf), filename);
+  name = BVAR (XBUFFER (buf), name);
 
   if (NILP (name))
     {
@@ -1329,9 +1329,9 @@
     }
 
   if (FRAME_HAS_MINIBUF_P (f)
-      && (!FRAMEP (kb->Vdefault_minibuffer_frame)
-          || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
-    kb->Vdefault_minibuffer_frame = frame;
+      && (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame))
+          || !FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame)))))
+    KVAR (kb, Vdefault_minibuffer_frame) = frame;
 
   /* All remaining specified parameters, which have not been "used"
      by x_get_arg and friends, now go in the misc. alist of the frame.  */
@@ -1428,7 +1428,7 @@
   NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil :
     [NSString stringWithUTF8String: SDATA (prompt)];
   NSString *dirS = NILP (dir) || !STRINGP (dir) ?
-    [NSString stringWithUTF8String: SDATA (B_ (current_buffer, directory))] :
+    [NSString stringWithUTF8String: SDATA (BVAR (current_buffer, directory))] :
     [NSString stringWithUTF8String: SDATA (dir)];
   NSString *initS = NILP (init) || !STRINGP (init) ? nil :
     [NSString stringWithUTF8String: SDATA (init)];

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-02-12 23:40:43 +0000
+++ b/src/nsterm.m      2011-02-17 10:19:29 +0000
@@ -3762,7 +3762,7 @@
 
   terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
   init_kboard (terminal->kboard);
-  terminal->kboard->Vwindow_system = Qns;
+  KVAR (terminal->kboard, Vwindow_system) = Qns;
   terminal->kboard->next_kboard = all_kboards;
   all_kboards = terminal->kboard;
   /* Don't let the initial kboard remain current longer than necessary.