diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-02-17 11:19:29 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-02-17 11:19:29 +0100 |
| commit | 124c9ff0e5bd3502ab669d7669390fcdc5bd6122 (patch) | |
| tree | f5949813f6f5cff24adfddd376a61cba44b1668d /src/nsfns.m | |
| parent | df70a04b097296737a1128a4163f0dfec1c3d51e (diff) | |
| download | emacs-124c9ff0e5bd3502ab669d7669390fcdc5bd6122.tar.gz emacs-124c9ff0e5bd3502ab669d7669390fcdc5bd6122.tar.bz2 emacs-124c9ff0e5bd3502ab669d7669390fcdc5bd6122.zip | |
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.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index c480c834602..6a5adbd7bf3 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -605,8 +605,8 @@ ns_set_name_as_filename (struct frame *f) 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 @@ be shared by the new frame. */) } 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 @@ Optional arg INIT, if non-nil, provides a default file name to use. */) 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)]; |