Merge from trunk.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d45543c8d36..de7b3506abc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
+
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer overflow fixes.
diff --git a/src/xselect.c b/src/xselect.c
index c33d011dba8..8741cb89967 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -904,7 +904,8 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol,
           converted_selections = cs;
         }
 
-      RETURN_UNGCPRO (0);
+      UNGCPRO;
+      return 0;
     }
 
   /* Otherwise, record the converted selection to binary.  */
@@ -919,7 +920,8 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol,
                                &(cs->data), &(cs->type),
                                &(cs->size), &(cs->format),
                                &(cs->nofree));
-  RETURN_UNGCPRO (1);
+  UNGCPRO;
+  return 1;
 }
 
 /* Handle a SelectionClear event EVENT, which indicates that some