diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 10:50:34 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 10:50:34 +0200 |
| commit | aca5fcdc4c8f4d77d1408adec856356257cdaf19 (patch) | |
| tree | a7334b9f4dc2eff797a288c63974a761f477b735 /src | |
| parent | 914b7f980836564c0a53c3573f26790a087686f3 (diff) | |
| download | emacs-aca5fcdc4c8f4d77d1408adec856356257cdaf19.tar.gz | |
Fix GNUStep specific menu items.
* lisp/menu-bar.el: Move GNUStep specific menus...
* lisp/term/ns-win.el (ns-initialize-window-system): ... to here.
* src/nsterm.m (Qcocoa, Qgnustep): New variables.
(syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one.
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 @@ +2013-10-20 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (Qcocoa, Qgnustep): New variables. + (syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one. + 2013-10-18 Eli Zaretskii <eliz@gnu.org> * 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; extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; static Lisp_Object QUTF8_STRING; +static Lisp_Object Qcocoa, Qgnustep; /* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold, the maximum font size to NOT antialias. On GNUstep there is currently @@ -7501,11 +7502,17 @@ baseline level. The default value is nil. */); /* Tell Emacs about this window system. */ Fprovide (Qns, Qnil); + DEFSYM (Qcocoa, "cocoa"); + DEFSYM (Qgnustep, "gnustep"); + syms_of_nsfont (); #ifdef NS_IMPL_COCOA + Fprovide (Qcocoa, Qnil); #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 syms_of_macfont (); #endif +#else + Fprovide (Qgnustep, Qnil); #endif } |