APPROVE COMMIT NOTE: This patch has been committed The actual patch is here: http://members.shaw.ca/akochoi-xemacs/Carbon%20XEmacs/Release%20Notes/7E0... The motivation is here: http://members.shaw.ca/akochoi-xemacs/Carbon%20XEmacs/Release%20Notes/7E0... src/ChangeLog.carbon2 addition: 2007-09-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; * select-carbon.c (pasteboard_get_utext_or_text): Merge Andrew Choi's change pasteboard-crash.diff XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: src/select-carbon.c =================================================================== RCS Index: src/select-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/select-carbon.c,v retrieving revision 1.1.2.3 diff -u -u -r1.1.2.3 select-carbon.c --- src/select-carbon.c 2007/09/30 19:48:31 1.1.2.3 +++ src/select-carbon.c 2007/09/30 20:51:42 ＠＠ -205,7 +205,11 ＠＠ { CFDataRef flavor_data; if (PasteboardCopyItemFlavorData (pasteboard, item_id, flavor_type, &flavor_data) != noErr) + { stderr_out ("Can't get flavor data"); + SysBeep (30); + return Qnil; + } Lisp_Object data = make_ext_string (CFDataGetBytePtr (flavor_data), CFDataGetLength (flavor_data), Qcarbon_unicode); ＠＠ -224,7 +228,11 ＠＠ { CFDataRef flavor_data; if (PasteboardCopyItemFlavorData (pasteboard, item_id, flavor_type, &flavor_data) != noErr) + { stderr_out ("Can't get flavor data"); + SysBeep (30); + return Qnil; + } Lisp_Object data = make_string (CFDataGetBytePtr (flavor_data), CFDataGetLength (flavor_data)); -- On the quay of the little Black Sea port, where the rescued pair came once more into contact with civilization, Dobrinton was bitten by a dog which was assumed to be mad, though it may only have been indiscriminating. (Saki) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches