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

[Ken Raeburn]

Index: emacs/src/xselect.c
diff -c emacs/src/xselect.c:1.122 emacs/src/xselect.c:1.123
*** emacs/src/xselect.c:1.122   Thu Jul 11 10:17:43 2002
--- emacs/src/xselect.c Sun Jul 14 20:00:41 2002
***************
*** 200,208 ****
  #endif
    if (!SYMBOLP (sym)) abort ();
  
!   TRACE1 (" XInternAtom %s", (char *) XSTRING (SYMBOL_NAME (sym))->data);
    BLOCK_INPUT;
!   val = XInternAtom (display, (char *) XSTRING (SYMBOL_NAME (sym))->data, 
False);
    UNBLOCK_INPUT;
    return val;
  }
--- 200,208 ----
  #endif
    if (!SYMBOLP (sym)) abort ();
  
!   TRACE1 (" XInternAtom %s", (char *) SDATA (SYMBOL_NAME (sym)));
    BLOCK_INPUT;
!   val = XInternAtom (display, (char *) SDATA (SYMBOL_NAME (sym)), False);
    UNBLOCK_INPUT;
    return val;
  }
***************
*** 1272,1278 ****
    if (NILP (XCAR (reading_selection_reply)))
      error ("Timed out waiting for reply from selection owner");
    if (EQ (XCAR (reading_selection_reply), Qlambda))
!     error ("No `%s' selection", XSTRING (SYMBOL_NAME 
(selection_symbol))->data);
  
    /* Otherwise, the selection is waiting for us on the requested property.  */
    return
--- 1272,1278 ----
    if (NILP (XCAR (reading_selection_reply)))
      error ("Timed out waiting for reply from selection owner");
    if (EQ (XCAR (reading_selection_reply), Qlambda))
!     error ("No `%s' selection", SDATA (SYMBOL_NAME (selection_symbol)));
  
    /* Otherwise, the selection is waiting for us on the requested property.  */
    return
***************
*** 1662,1668 ****
            str = run_pre_post_conversion_on_str (str, &coding, 0);
          Vlast_coding_system_used = coding.symbol;
        }
!       compose_chars_in_text (0, XSTRING (str)->size, str);
        return str;
      }
    /* Convert a single atom to a Lisp_Symbol.  Convert a set of atoms to
--- 1662,1668 ----
            str = run_pre_post_conversion_on_str (str, &coding, 0);
          Vlast_coding_system_used = coding.symbol;
        }
!       compose_chars_in_text (0, SCHARS (str), str);
        return str;
      }
    /* Convert a single atom to a Lisp_Symbol.  Convert a set of atoms to
***************
*** 1778,1784 ****
          Lisp_Object unibyte_string;
  
          unibyte_string = string_make_unibyte (obj);
!         *data_ret = XSTRING (unibyte_string)->data;
          *nofree_ret = 1;
          *size_ret = SBYTES (unibyte_string);
        }
--- 1778,1784 ----
          Lisp_Object unibyte_string;
  
          unibyte_string = string_make_unibyte (obj);
!         *data_ret = SDATA (unibyte_string);
          *nofree_ret = 1;
          *size_ret = SBYTES (unibyte_string);
        }
***************
*** 1786,1792 ****
        {
          *data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
                                     (int *) size_ret, &stringp);
!         *nofree_ret = (*data_ret == XSTRING (obj)->data);
        }
        if (NILP (type))
        type = (stringp ? QSTRING : QCOMPOUND_TEXT);
--- 1786,1792 ----
        {
          *data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
                                     (int *) size_ret, &stringp);
!         *nofree_ret = (*data_ret == SDATA (obj));
        }
        if (NILP (type))
        type = (stringp ? QSTRING : QCOMPOUND_TEXT);
***************
*** 2277,2284 ****
    CHECK_STRING (string);
    buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (sf),
                                  display, buffer);
!   data = (unsigned char *) XSTRING (string)->data;
!   bytes = STRING_BYTES (XSTRING (string));
    bytes_remaining = bytes;
  
    if (! FRAME_X_DISPLAY_INFO (sf)->cut_buffers_initialized)
--- 2277,2284 ----
    CHECK_STRING (string);
    buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (sf),
                                  display, buffer);
!   data = (unsigned char *) SDATA (string);
!   bytes = SBYTES (string);
    bytes_remaining = bytes;
  
    if (! FRAME_X_DISPLAY_INFO (sf)->cut_buffers_initialized)