Commit 124c9ff0 authored by Jan Djärv's avatar Jan Djärv
Browse files

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.
parent df70a04b
2011-02-17 Jan Djärv <jan.h.d@swipnet.se>
* 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 <eliz@gnu.org>
* msdos.c (internal_terminal_init): Use KVAR.
......@@ -605,8 +605,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
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 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
}
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 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
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)];
......
......@@ -3762,7 +3762,7 @@ Needs to be here because ns_initialize_display_info () uses AppKit classes.
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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment