* Recent BVAR and KVAR changes break the nextstep build
@ 2011-02-17 4:55 Ben Key
0 siblings, 0 replies; only message in thread
From: Ben Key @ 2011-02-17 4:55 UTC (permalink / raw)
To: emacs-devel
[-- Attachment #1: Type: text/plain, Size: 2089 bytes --]
The recent BVAR and KVAR changes to the Emacs trunk have broken the NextStep
build. The following patch fixes the problem.
=== modified file 'src/nsfns.m'
--- src/nsfns.m 2011-02-15 03:57:00 +0000
+++ src/nsfns.m 2011-02-17 04:42:04 +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'
--- src/nsterm.m 2011-02-12 23:40:43 +0000
+++ src/nsterm.m 2011-02-17 04:37:52 +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.
[-- Attachment #2: Type: text/html, Size: 2394 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-17 4:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 4:55 Recent BVAR and KVAR changes break the nextstep build Ben Key
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.