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

[Ken Raeburn]

Index: emacs/src/w32select.c
diff -c emacs/src/w32select.c:1.25 emacs/src/w32select.c:1.26
*** emacs/src/w32select.c:1.25  Mon Jun 24 03:54:51 2002
--- emacs/src/w32select.c       Sun Jul 14 20:00:37 2002
***************
*** 125,132 ****
    
    BLOCK_INPUT;
  
!   nbytes = STRING_BYTES (XSTRING (string)) + 1;
!   src = XSTRING (string)->data;
    dst = src;
  
    /* We need to know how many lines there are, since we need CRLF line
--- 125,132 ----
    
    BLOCK_INPUT;
  
!   nbytes = SBYTES (string) + 1;
!   src = SDATA (string);
    dst = src;
  
    /* We need to know how many lines there are, since we need CRLF line
***************
*** 141,147 ****
    {
      /* Since we are now handling multilingual text, we must consider
         encoding text for the clipboard.  */
!     int charset_info = find_charset_in_text (src, XSTRING (string)->size,
                                             nbytes, NULL, Qnil);
  
      if (charset_info == 0)
--- 141,147 ----
    {
      /* Since we are now handling multilingual text, we must consider
         encoding text for the clipboard.  */
!     int charset_info = find_charset_in_text (src, SCHARS (string),
                                             nbytes, NULL, Qnil);
  
      if (charset_info == 0)
***************
*** 202,209 ****
            && !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;
--- 202,209 ----
            && !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;
***************
*** 368,374 ****
        /* Convert CRLF line endings (the standard CF_TEXT clipboard
           format) to LF endings as used internally by Emacs.  */
  
!       dst = XSTRING (ret)->data;
        while (1)
          {
            unsigned char *next;
--- 368,374 ----
        /* Convert CRLF line endings (the standard CF_TEXT clipboard
           format) to LF endings as used internally by Emacs.  */
  
!       dst = SDATA (ret);
        while (1)
          {
            unsigned char *next;