diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /src/xselect.c | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
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 173cf78bdaa..15ce8d487fa 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -931,6 +931,7 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol, | |||
| 931 | 931 | ||
| 932 | /* Otherwise, record the converted selection to binary. */ | 932 | /* Otherwise, record the converted selection to binary. */ |
| 933 | cs = xmalloc (sizeof (struct selection_data)); | 933 | cs = xmalloc (sizeof (struct selection_data)); |
| 934 | cs->data = NULL; | ||
| 934 | cs->nofree = 1; | 935 | cs->nofree = 1; |
| 935 | cs->property = property; | 936 | cs->property = property; |
| 936 | cs->wait_object = NULL; | 937 | cs->wait_object = NULL; |