diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/xselect.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xselect.c b/src/xselect.c index 290f4d7eb4d..48baeb32581 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -930,6 +930,7 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol, | |||
| 930 | 930 | ||
| 931 | /* Otherwise, record the converted selection to binary. */ | 931 | /* Otherwise, record the converted selection to binary. */ |
| 932 | cs = xmalloc (sizeof (struct selection_data)); | 932 | cs = xmalloc (sizeof (struct selection_data)); |
| 933 | cs->data = NULL; | ||
| 933 | cs->nofree = 1; | 934 | cs->nofree = 1; |
| 934 | cs->property = property; | 935 | cs->property = property; |
| 935 | cs->wait_object = NULL; | 936 | cs->wait_object = NULL; |