From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 9 Jan 1998 23:22:10 +0000 (+0000)
Subject: (lisp_data_to_selection_data): Use size_byte.
X-Git-Tag: emacs-20.3~2443
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0120fdf9e38782d60d627e4c42e2be6660e90ddc;p=emacs.git

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

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,
       int num;
 
       *format_ret = 8;
-      *size_ret = XSTRING (obj)->size;
+      *size_ret = XSTRING (obj)->size_byte;
       *data_ret = XSTRING (obj)->data;
       bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
       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,
   buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (selected_frame),
 				  display, buffer);
   data = (unsigned char *) XSTRING (string)->data;
-  bytes = XSTRING (string)->size;
+  bytes = XSTRING (string)->size_byte;
   bytes_remaining = bytes;
 
   if (! FRAME_X_DISPLAY_INFO (selected_frame)->cut_buffers_initialized)