[Emacs-diffs] Changes to emacs/src/w16select.c

[Ken Raeburn]

Index: emacs/src/w16select.c
diff -c emacs/src/w16select.c:1.29 emacs/src/w16select.c:1.30
*** emacs/src/w16select.c:1.29  Mon Jun 24 03:55:57 2002
--- emacs/src/w16select.c       Sun Jul 14 20:00:37 2002
***************
*** 501,512 ****
  
    BLOCK_INPUT;
  
!   nbytes = STRING_BYTES (XSTRING (string));
!   src = XSTRING (string)->data;
  
    /* Since we are now handling multilingual text, we must consider
       encoding text for the clipboard.  */
!   charset_info = find_charset_in_text (src, XSTRING (string)->size, nbytes,
                                       NULL, Qnil);
  
    if (charset_info == 0)
--- 501,512 ----
  
    BLOCK_INPUT;
  
!   nbytes = SBYTES (string);
!   src = SDATA (string);
  
    /* Since we are now handling multilingual text, we must consider
       encoding text for the clipboard.  */
!   charset_info = find_charset_in_text (src, SCHARS (string), nbytes,
                                       NULL, Qnil);
  
    if (charset_info == 0)
***************
*** 531,538 ****
          && !NILP (Ffboundp (coding.pre_write_conversion)))
        {
          string = run_pre_post_conversion_on_str (string, &coding, 1);
!         src = XSTRING (string)->data;
!         nbytes = STRING_BYTES (XSTRING (string));
        }
        coding.src_multibyte = 1;
        coding.dst_multibyte = 0;
--- 531,538 ----
          && !NILP (Ffboundp (coding.pre_write_conversion)))
        {
          string = run_pre_post_conversion_on_str (string, &coding, 1);
!         src = SDATA (string);
!         nbytes = SBYTES (string);
        }
        coding.src_multibyte = 1;
        coding.dst_multibyte = 0;