From: Stefan Monnier Date: Fri, 27 May 2011 19:39:18 +0000 (-0300) Subject: * src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~137^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959;p=emacs.git * src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1ffeba88607..1f7c7e6559b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-05-27 Stefan Monnier + + * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. + 2011-05-27 Paul Eggert * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings. 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