CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/09/30 23:14:35

  Branch:      xemacs/src carbon2 carbon2
  Modified:    xemacs/src select-carbon.c
  Added:       xemacs/src ChangeLog.carbon2
Log:
carbon2: Merge a pasteboard bugfix from Andrew Choi

Revision  Changes    Path
1.1.2.4   +8 -0      XEmacs/xemacs/src/Attic/select-carbon.c

Index: select-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/select-carbon.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- select-carbon.c	2007/09/30 19:48:31	1.1.2.3
+++ select-carbon.c	2007/09/30 21:14:35	1.1.2.4
@@ -205,7 +205,11 @@ pasteboard_get_utext_or_text (Pasteboard
 	    {
 	      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 @@ pasteboard_get_utext_or_text (Pasteboard
 	    {
 	      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));
 	      



1.1.2.1   +6 -0      XEmacs/xemacs/src/Attic/ChangeLog.carbon2

Index: ChangeLog.carbon2
===================================================================
RCS file: ChangeLog.carbon2
diff -N ChangeLog.carbon2
--- /dev/null	Sun Sep 30 23:14:33 2007
+++ /tmp/cvsAAAEza4nF	Sun Sep 30 23:14:35 2007
@@ -0,0 +1,6 @@
+2007-09-30  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* select-carbon.c (pasteboard_get_utext_or_text):
+        Merge Andrew Choi's change pasteboard-crash.diff
+
+