diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 10:11:35 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 10:11:35 +0200 |
| commit | 699c10bd69f9395a5705b86259b957b7ed75f8ef (patch) | |
| tree | 0f2a8f9fbe20f446f5a94bad6f6296909c5f87d2 /src/nsterm.h | |
| parent | d760b73104d0533a222adb058f48da3e4ca61f3f (diff) | |
| download | emacs-699c10bd69f9395a5705b86259b957b7ed75f8ef.tar.gz emacs-699c10bd69f9395a5705b86259b957b7ed75f8ef.tar.bz2 emacs-699c10bd69f9395a5705b86259b957b7ed75f8ef.zip | |
Fix services menu empty on OSX 1.6+.
* nsfns.m (Fx_open_connection): Remove NSStringPboardType from
ns_return_types.
(Fns_list_services): Just return Qnil on 10.6, code not working there.
* nsmenu.m (ns_update_menubar): Remove useless setDelegate call
on svcsMenu.
* nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).
* nsterm.h (MAC_OS_X_VERSION_10_6): Define here instead of nsterm.m.
(ns_get_local_selection): Declare.
* nsterm.m (QUTF8_STRING): Declare.
(initFrameFromEmacs): Call registerServicesMenuSendTypes.
(validRequestorForSendType): Return type is (id).
Change indexOfObjectIdenticalTo to indexOfObject.
Check if we have local selection before returning self (Bug#8842).
(writeSelectionToPasteboard): Put local selection into paste board
if we have a local selection (Bug#8842).
(syms_of_nsterm): DEFSYM QUTF8_STRING.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 7459087c988..b442973f0d9 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -25,6 +25,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_NS +#ifdef NS_IMPL_COCOA +#ifndef MAC_OS_X_VERSION_10_6 +#define MAC_OS_X_VERSION_10_6 1060 +#endif +#endif + #ifdef __OBJC__ /* ========================================================================== @@ -700,6 +706,8 @@ extern void check_ns (void); extern Lisp_Object ns_map_event_to_object (); extern Lisp_Object ns_string_from_pasteboard (); extern void ns_string_to_pasteboard (); +extern Lisp_Object ns_get_local_selection (Lisp_Object selection_name, + Lisp_Object target_type); extern void nxatoms_of_nsselect (); extern int ns_lisp_to_cursor_type (); extern Lisp_Object ns_cursor_type_to_lisp (int arg); |