Mercurial > emacs
changeset 43456:bfca0eb3e752
Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 22 Feb 2002 13:20:00 +0000 |
| parents | c6e68db7db51 |
| children | 28a141684094 |
| files | src/ChangeLog src/xselect.c |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Feb 22 13:16:35 2002 +0000 +++ b/src/ChangeLog Fri Feb 22 13:20:00 2002 +0000 @@ -2,12 +2,12 @@ Support for ICCCM Extended Segments in X selections: - * xselect.c <Qcompound_text_with_extensions>: New variable. + * xselect.c <Qcompound_text_no_extensions>: New variable. (syms_of_xselect): Intern and staticpro it. (selection_data_to_lisp_data): Run post-read-conversion on decoded selection text. (lisp_data_to_selection_data): If next-selection-coding-system is - compound-text-with-extensions, set the type of selection to be + compound-text-no-extensions, set the type of selection to be compound-text. * xterm.h (x_encode_text): Update prototype.
--- a/src/xselect.c Fri Feb 22 13:16:35 2002 +0000 +++ b/src/xselect.c Fri Feb 22 13:20:00 2002 +0000 @@ -97,7 +97,7 @@ Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ -Lisp_Object Qcompound_text_with_extensions; +Lisp_Object Qcompound_text_no_extensions; #ifdef CUT_BUFFER_SUPPORT Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3, @@ -1766,7 +1766,7 @@ (int *) size_ret, &stringp); *nofree_ret = (*data_ret == XSTRING (obj)->data); if (EQ (Vnext_selection_coding_system, - Qcompound_text_with_extensions)) + Qcompound_text_no_extensions)) type = QCOMPOUND_TEXT; else if (NILP (type)) type = (stringp ? QSTRING : QCOMPOUND_TEXT); @@ -2435,8 +2435,8 @@ 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); + 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);