Commit 23e16093 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix last change.

parent fbbe0ace
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
   
Support for ICCCM Extended Segments in X selections: 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. (syms_of_xselect): Intern and staticpro it.
(selection_data_to_lisp_data): Run post-read-conversion on decoded (selection_data_to_lisp_data): Run post-read-conversion on decoded
selection text. selection text.
(lisp_data_to_selection_data): If next-selection-coding-system is (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. compound-text.
   
* xterm.h (x_encode_text): Update prototype. * xterm.h (x_encode_text): Update prototype.
......
...@@ -97,7 +97,7 @@ Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, ...@@ -97,7 +97,7 @@ Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ 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 #ifdef CUT_BUFFER_SUPPORT
Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3, Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
...@@ -1766,7 +1766,7 @@ lisp_data_to_selection_data (display, obj, ...@@ -1766,7 +1766,7 @@ lisp_data_to_selection_data (display, obj,
(int *) size_ret, &stringp); (int *) size_ret, &stringp);
*nofree_ret = (*data_ret == XSTRING (obj)->data); *nofree_ret = (*data_ret == XSTRING (obj)->data);
if (EQ (Vnext_selection_coding_system, if (EQ (Vnext_selection_coding_system,
Qcompound_text_with_extensions)) Qcompound_text_no_extensions))
type = QCOMPOUND_TEXT; type = QCOMPOUND_TEXT;
else if (NILP (type)) else if (NILP (type))
type = (stringp ? QSTRING : QCOMPOUND_TEXT); type = (stringp ? QSTRING : QCOMPOUND_TEXT);
...@@ -2435,8 +2435,8 @@ A value of 0 means wait as long as necessary. This is initialized from the ...@@ -2435,8 +2435,8 @@ A value of 0 means wait as long as necessary. This is initialized from the
QATOM = intern ("ATOM"); staticpro (&QATOM); QATOM = intern ("ATOM"); staticpro (&QATOM);
QATOM_PAIR = intern ("ATOM_PAIR"); staticpro (&QATOM_PAIR); QATOM_PAIR = intern ("ATOM_PAIR"); staticpro (&QATOM_PAIR);
QNULL = intern ("NULL"); staticpro (&QNULL); QNULL = intern ("NULL"); staticpro (&QNULL);
Qcompound_text_with_extensions = intern ("compound-text-with-extensions"); Qcompound_text_no_extensions = intern ("compound-text-no-extensions");
staticpro (&Qcompound_text_with_extensions); staticpro (&Qcompound_text_no_extensions);
#ifdef CUT_BUFFER_SUPPORT #ifdef CUT_BUFFER_SUPPORT
QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0); QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment