* src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ffeba88607e09f79bb9f6ebcb0c15657fa4c9aa..1f7c7e6559b8c76baa785565b0003ecb43b68bb5 100644 (file)
--- 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>
 
        * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.

diff --git a/src/xselect.c b/src/xselect.c
index c33d011dba8c85aae9ddd776de7f45c2371b6342..8741cb899671f9c95956a57b61792ea2955f0c5b 100644 (file)
--- 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;
 }
 \f
 /* Handle a SelectionClear event EVENT, which indicates that some