diff options
| author | Stefan Monnier | 2011-05-27 16:39:18 -0300 |
|---|---|---|
| committer | Stefan Monnier | 2011-05-27 16:39:18 -0300 |
| commit | 18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959 (patch) | |
| tree | 64d34f14a0024984fd67270e2d6da9b69e6a213d /src/xselect.c | |
| parent | 7a6b1aef76c5e2afdd72b4ce44c27452f7c972ef (diff) | |
| download | emacs-18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959.tar.gz emacs-18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959.zip | |
* src/xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, | |||
| 904 | converted_selections = cs; | 904 | converted_selections = cs; |
| 905 | } | 905 | } |
| 906 | 906 | ||
| 907 | RETURN_UNGCPRO (0); | 907 | UNGCPRO; |
| 908 | return 0; | ||
| 908 | } | 909 | } |
| 909 | 910 | ||
| 910 | /* Otherwise, record the converted selection to binary. */ | 911 | /* Otherwise, record the converted selection to binary. */ |
| @@ -919,7 +920,8 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol, | |||
| 919 | &(cs->data), &(cs->type), | 920 | &(cs->data), &(cs->type), |
| 920 | &(cs->size), &(cs->format), | 921 | &(cs->size), &(cs->format), |
| 921 | &(cs->nofree)); | 922 | &(cs->nofree)); |
| 922 | RETURN_UNGCPRO (1); | 923 | UNGCPRO; |
| 924 | return 1; | ||
| 923 | } | 925 | } |
| 924 | 926 | ||
| 925 | /* Handle a SelectionClear event EVENT, which indicates that some | 927 | /* Handle a SelectionClear event EVENT, which indicates that some |