mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-30 10:11:47 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Stefan Monnier 2011-05-27 16:39:18 -03:00
parent 7a6b1aef76
commit 18480f8fc0
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

6
src/xselect.c
View file

@ -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