emacs-devel
[
Top
][
All Lists
]
Advanced
[
Date Prev
][
Date Next
][
Thread Prev
][
Thread Next
][
Date Index
][
Thread Index
]
Recent BVAR and KVAR changes break the nextstep build
From
:
Ben Key
Subject
:
Recent BVAR and KVAR changes break the nextstep build
Date
:
Wed, 16 Feb 2011 22:55:11 -0600
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.
reply via email to
[Prev in Thread]
Current Thread
[Next in Thread]
Recent BVAR and KVAR changes break the nextstep build
,
Ben Key
<=
Prev by Date:
Re: A new major-mode for Python
Next by Date:
Re: auth-source-search: annoying messages
Previous by thread:
auth-source-search: annoying messages
Next by thread:
Input method or help feature needed
Index(es):
Date
Thread