aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2002-02-22 13:20:00 +0000
committerEli Zaretskii2002-02-22 13:20:00 +0000
commit23e16093ecd087847f494aaebbf58816415eed06 (patch)
tree8d8ba6e5cd0e956ced2a1f52619d8be5403775c5
parentfbbe0aceda052c399f798ea9817bcb3b095f8dbd (diff)
downloademacs-23e16093ecd087847f494aaebbf58816415eed06.tar.gz
emacs-23e16093ecd087847f494aaebbf58816415eed06.zip
Fix last change.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xselect.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 078a6178f7d..579370e65cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,12 +2,12 @@
2 2
3 Support for ICCCM Extended Segments in X selections: 3 Support for ICCCM Extended Segments in X selections:
4 4
5 * xselect.c <Qcompound_text_with_extensions>: New variable. 5 * xselect.c <Qcompound_text_no_extensions>: New variable.
6 (syms_of_xselect): Intern and staticpro it. 6 (syms_of_xselect): Intern and staticpro it.
7 (selection_data_to_lisp_data): Run post-read-conversion on decoded 7 (selection_data_to_lisp_data): Run post-read-conversion on decoded
8 selection text. 8 selection text.
9 (lisp_data_to_selection_data): If next-selection-coding-system is 9 (lisp_data_to_selection_data): If next-selection-coding-system is
10 compound-text-with-extensions, set the type of selection to be 10 compound-text-no-extensions, set the type of selection to be
11 compound-text. 11 compound-text.
12 12
13 * xterm.h (x_encode_text): Update prototype. 13 * xterm.h (x_encode_text): Update prototype.
diff --git a/src/xselect.c b/src/xselect.c
index a3ec3e40d0e..660e0060020 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -97,7 +97,7 @@ Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
97 97
98Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ 98Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */
99 99
100Lisp_Object Qcompound_text_with_extensions; 100Lisp_Object Qcompound_text_no_extensions;
101 101
102#ifdef CUT_BUFFER_SUPPORT 102#ifdef CUT_BUFFER_SUPPORT
103Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3, 103Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
@@ -1766,7 +1766,7 @@ lisp_data_to_selection_data (display, obj,
1766 (int *) size_ret, &stringp); 1766 (int *) size_ret, &stringp);
1767 *nofree_ret = (*data_ret == XSTRING (obj)->data); 1767 *nofree_ret = (*data_ret == XSTRING (obj)->data);
1768 if (EQ (Vnext_selection_coding_system, 1768 if (EQ (Vnext_selection_coding_system,
1769 Qcompound_text_with_extensions)) 1769 Qcompound_text_no_extensions))
1770 type = QCOMPOUND_TEXT; 1770 type = QCOMPOUND_TEXT;
1771 else if (NILP (type)) 1771 else if (NILP (type))
1772 type = (stringp ? QSTRING : QCOMPOUND_TEXT); 1772 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 QATOM = intern ("ATOM"); staticpro (&QATOM); 2435 QATOM = intern ("ATOM"); staticpro (&QATOM);
2436 QATOM_PAIR = intern ("ATOM_PAIR"); staticpro (&QATOM_PAIR); 2436 QATOM_PAIR = intern ("ATOM_PAIR"); staticpro (&QATOM_PAIR);
2437 QNULL = intern ("NULL"); staticpro (&QNULL); 2437 QNULL = intern ("NULL"); staticpro (&QNULL);
2438 Qcompound_text_with_extensions = intern ("compound-text-with-extensions"); 2438 Qcompound_text_no_extensions = intern ("compound-text-no-extensions");
2439 staticpro (&Qcompound_text_with_extensions); 2439 staticpro (&Qcompound_text_no_extensions);
2440 2440
2441#ifdef CUT_BUFFER_SUPPORT 2441#ifdef CUT_BUFFER_SUPPORT
2442 QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0); 2442 QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);