[Emacs-diffs] /srv/bzr/emacs/trunk r104389: * src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.

[Stefan Monnier]

------------------------------------------------------------
revno: 104389
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-27 16:39:18 -0300
message:
  * src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
modified:
  src/ChangeLog
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-27 19:32:01 +0000
+++ b/src/ChangeLog     2011-05-27 19:39:18 +0000
@@ -1,3 +1,7 @@
+2011-05-27  Stefan Monnier  <address@hidden>
+
+       * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
+
 2011-05-27  Paul Eggert  <address@hidden>
 
        * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2011-05-27 19:32:01 +0000
+++ b/src/xselect.c     2011-05-27 19:39:18 +0000
@@ -904,7 +904,8 @@
          converted_selections = cs;
        }
 
-      RETURN_UNGCPRO (0);
+      UNGCPRO;
+      return 0;
     }
 
   /* Otherwise, record the converted selection to binary.  */
@@ -919,7 +920,8 @@
                               &(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