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

[Eli Zaretskii]

Index: emacs/src/xselect.c
diff -c emacs/src/xselect.c:1.111 emacs/src/xselect.c:1.112
*** emacs/src/xselect.c:1.111   Sat Feb 23 03:53:27 2002
--- emacs/src/xselect.c Tue Feb 26 11:37:15 2002
***************
*** 97,103 ****
  
  Lisp_Object QCOMPOUND_TEXT;   /* This is a type of selection.  */
  
! Lisp_Object Qcompound_text_no_extensions;
  
  #ifdef CUT_BUFFER_SUPPORT
  Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
--- 97,103 ----
  
  Lisp_Object QCOMPOUND_TEXT;   /* This is a type of selection.  */
  
! Lisp_Object Qcompound_text_with_extensions;
  
  #ifdef CUT_BUFFER_SUPPORT
  Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
***************
*** 1766,1772 ****
                                 (int *) size_ret, &stringp);
        *nofree_ret = (*data_ret == XSTRING (obj)->data);
        if (EQ (Vnext_selection_coding_system,
!             Qcompound_text_no_extensions))
        type = QCOMPOUND_TEXT;
        else if (NILP (type))
        type = (stringp ? QSTRING : QCOMPOUND_TEXT);
--- 1766,1772 ----
                                 (int *) size_ret, &stringp);
        *nofree_ret = (*data_ret == XSTRING (obj)->data);
        if (EQ (Vnext_selection_coding_system,
!             Qcompound_text_with_extensions))
        type = QCOMPOUND_TEXT;
        else if (NILP (type))
        type = (stringp ? QSTRING : QCOMPOUND_TEXT);
***************
*** 2400,2407 ****
               doc: /* Coding system for communicating with other X clients.
  When sending or receiving text via cut_buffer, selection, and clipboard,
  the text is encoded or decoded by this coding system.
! The default value is `compound-text'.  */);
!   Vselection_coding_system = intern ("compound-text");
  
    DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
               doc: /* Coding system for the next communication with other X 
clients.
--- 2400,2407 ----
               doc: /* Coding system for communicating with other X clients.
  When sending or receiving text via cut_buffer, selection, and clipboard,
  the text is encoded or decoded by this coding system.
! The default value is `compound-text-with-extensions'.  */);
!   Vselection_coding_system = intern ("compound-text-with-extensions");
  
    DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
               doc: /* Coding system for the next communication with other X 
clients.
***************
*** 2435,2442 ****
    QATOM            = intern ("ATOM");         staticpro (&QATOM);
    QATOM_PAIR = intern ("ATOM_PAIR");  staticpro (&QATOM_PAIR);
    QNULL            = intern ("NULL");         staticpro (&QNULL);
!   Qcompound_text_no_extensions = intern ("compound-text-no-extensions");
!   staticpro (&Qcompound_text_no_extensions);
  
  #ifdef CUT_BUFFER_SUPPORT
    QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);
--- 2435,2442 ----
    QATOM            = intern ("ATOM");         staticpro (&QATOM);
    QATOM_PAIR = intern ("ATOM_PAIR");  staticpro (&QATOM_PAIR);
    QNULL            = intern ("NULL");         staticpro (&QNULL);
!   Qcompound_text_with_extensions = intern ("compound-text-with-extensions");
!   staticpro (&Qcompound_text_with_extensions);
  
  #ifdef CUT_BUFFER_SUPPORT
    QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);