diff options
| author | Richard M. Stallman | 1998-01-09 23:22:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-01-09 23:22:10 +0000 |
| commit | 0120fdf9e38782d60d627e4c42e2be6660e90ddc (patch) | |
| tree | 61fc2d4117ac9eb6d7cd8c615ab878e6c9e2c4af /src | |
| parent | 0869c141aaa1ed145c151c530197a2fe41656b08 (diff) | |
| download | emacs-0120fdf9e38782d60d627e4c42e2be6660e90ddc.tar.gz emacs-0120fdf9e38782d60d627e4c42e2be6660e90ddc.zip | |
(lisp_data_to_selection_data): Use size_byte.
(Fx_store_cut_buffer_internal): Use size_byte.
(selection_data_to_lisp_data): Use make_multibyte_string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xselect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xselect.c b/src/xselect.c index 090f49584ea..1981d4b63b6 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1610,7 +1610,7 @@ lisp_data_to_selection_data (display, obj, | |||
| 1610 | int num; | 1610 | int num; |
| 1611 | 1611 | ||
| 1612 | *format_ret = 8; | 1612 | *format_ret = 8; |
| 1613 | *size_ret = XSTRING (obj)->size; | 1613 | *size_ret = XSTRING (obj)->size_byte; |
| 1614 | *data_ret = XSTRING (obj)->data; | 1614 | *data_ret = XSTRING (obj)->data; |
| 1615 | bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); | 1615 | bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); |
| 1616 | num = ((*size_ret <= 1 /* Check the possibility of short cut. */ | 1616 | num = ((*size_ret <= 1 /* Check the possibility of short cut. */ |
| @@ -2133,7 +2133,7 @@ DEFUN ("x-store-cut-buffer-internal", Fx_store_cut_buffer_internal, | |||
| 2133 | buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (selected_frame), | 2133 | buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (selected_frame), |
| 2134 | display, buffer); | 2134 | display, buffer); |
| 2135 | data = (unsigned char *) XSTRING (string)->data; | 2135 | data = (unsigned char *) XSTRING (string)->data; |
| 2136 | bytes = XSTRING (string)->size; | 2136 | bytes = XSTRING (string)->size_byte; |
| 2137 | bytes_remaining = bytes; | 2137 | bytes_remaining = bytes; |
| 2138 | 2138 | ||
| 2139 | if (! FRAME_X_DISPLAY_INFO (selected_frame)->cut_buffers_initialized) | 2139 | if (! FRAME_X_DISPLAY_INFO (selected_frame)->cut_buffers_initialized) |