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

[Eli Zaretskii]

Index: emacs/src/xselect.c
diff -c emacs/src/xselect.c:1.113 emacs/src/xselect.c:1.114
*** emacs/src/xselect.c:1.113   Mon Mar  4 18:40:59 2002
--- emacs/src/xselect.c Tue May  7 01:46:05 2002
***************
*** 1765,1775 ****
        *data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
                                 (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);
        Vlast_coding_system_used = (*nofree_ret
                                  ? Qraw_text
                                  : Vnext_selection_coding_system);
--- 1765,1780 ----
        *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))
!       {
!         if (stringp && *nofree_ret)
!           type = QSTRING;
!         else if (EQ (Vnext_selection_coding_system,
!                      Qcompound_text_with_extensions))
!           type = QCOMPOUND_TEXT;
!         else
!           type = (stringp ? QSTRING : QCOMPOUND_TEXT);
!       }
        Vlast_coding_system_used = (*nofree_ret
                                  ? Qraw_text
                                  : Vnext_selection_coding_system);