procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ifdef NS_IMPL_COCOA aound OSX version check (for clang)

Browse source 
* nsfns.m (Fns_popup_font_panel): Ditto.

* nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
This commit is contained in:
Jan Djärv 2014-07-11 18:33:17 +02:00
parent d79194419b
commit 4757131077
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-07-11 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
* nsfns.m (Fns_popup_font_panel): Ditto.
2014-07-11 Eli Zaretskii <eliz@gnu.org>
* minibuf.c (read_minibuf_noninteractive): Finish reading on '\r',

2
src/nsfns.m
View file

@ -1390,9 +1390,11 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
NSFont *nsfont;
if (EQ (font->driver->type, Qns))
nsfont = ((struct nsfont_info *)font)->nsfont;
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
else
nsfont = (NSFont *) macfont_get_nsctfont (font);
#endif
#endif
[fm setSelectedFont: nsfont isMultiple: NO];
[fm orderFrontFontPanel: NSApp];

2
src/nsterm.m
View file

@ -5012,9 +5012,11 @@ - (void)changeFont: (id)sender
if (EQ (font->driver->type, Qns))
nsfont = ((struct nsfont_info *)font)->nsfont;
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
else
nsfont = (NSFont *) macfont_get_nsctfont (font);
#endif
#endif
if ((newFont = [sender convertFont: nsfont]))