diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b973b5b8d04..c229c50b663 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-10-20 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (Qcocoa, Qgnustep): New variables. | ||
| 4 | (syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one. | ||
| 5 | |||
| 1 | 2013-10-18 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-10-18 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * keyboard.c (make_lispy_event): Remove GPM-specific code that | 8 | * keyboard.c (make_lispy_event): Remove GPM-specific code that |
diff --git a/src/nsterm.m b/src/nsterm.m index 5b2c6a3f686..11aba4edd4a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -173,6 +173,7 @@ Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper; | |||
| 173 | extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; | 173 | extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; |
| 174 | 174 | ||
| 175 | static Lisp_Object QUTF8_STRING; | 175 | static Lisp_Object QUTF8_STRING; |
| 176 | static Lisp_Object Qcocoa, Qgnustep; | ||
| 176 | 177 | ||
| 177 | /* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold, | 178 | /* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold, |
| 178 | the maximum font size to NOT antialias. On GNUstep there is currently | 179 | the maximum font size to NOT antialias. On GNUstep there is currently |
| @@ -7501,11 +7502,17 @@ baseline level. The default value is nil. */); | |||
| 7501 | /* Tell Emacs about this window system. */ | 7502 | /* Tell Emacs about this window system. */ |
| 7502 | Fprovide (Qns, Qnil); | 7503 | Fprovide (Qns, Qnil); |
| 7503 | 7504 | ||
| 7505 | DEFSYM (Qcocoa, "cocoa"); | ||
| 7506 | DEFSYM (Qgnustep, "gnustep"); | ||
| 7507 | |||
| 7504 | syms_of_nsfont (); | 7508 | syms_of_nsfont (); |
| 7505 | #ifdef NS_IMPL_COCOA | 7509 | #ifdef NS_IMPL_COCOA |
| 7510 | Fprovide (Qcocoa, Qnil); | ||
| 7506 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 | 7511 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 |
| 7507 | syms_of_macfont (); | 7512 | syms_of_macfont (); |
| 7508 | #endif | 7513 | #endif |
| 7514 | #else | ||
| 7515 | Fprovide (Qgnustep, Qnil); | ||
| 7509 | #endif | 7516 | #endif |
| 7510 | 7517 | ||
| 7511 | } | 7518 | } |