diff options
| author | Eli Zaretskii | 2002-02-26 16:37:15 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-02-26 16:37:15 +0000 |
| commit | 5a79ea57c6b49ae7190a25613399a0cdd4c8bd34 (patch) | |
| tree | a5a21e340bf0657bbb685c0de9b9987dacee7fb0 /src | |
| parent | 5dde3c716fd5a30910fbfe3819d18e39d9279564 (diff) | |
| download | emacs-5a79ea57c6b49ae7190a25613399a0cdd4c8bd34.tar.gz emacs-5a79ea57c6b49ae7190a25613399a0cdd4c8bd34.zip | |
(Qcompound_text_with_extensions): Renamed from Qcompound_text_no_extensions.
(lisp_data_to_selection_data, syms_of_xselect): Use the new name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xselect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xselect.c b/src/xselect.c index 06c0ec6362c..d21a978060f 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -97,7 +97,7 @@ Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, | |||
| 97 | 97 | ||
| 98 | Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ | 98 | Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ |
| 99 | 99 | ||
| 100 | Lisp_Object Qcompound_text_no_extensions; | 100 | Lisp_Object Qcompound_text_with_extensions; |
| 101 | 101 | ||
| 102 | #ifdef CUT_BUFFER_SUPPORT | 102 | #ifdef CUT_BUFFER_SUPPORT |
| 103 | Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3, | 103 | Lisp_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_no_extensions)) | 1769 | Qcompound_text_with_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); |
| @@ -2400,8 +2400,8 @@ it merely informs you that they have happened. */); | |||
| 2400 | doc: /* Coding system for communicating with other X clients. | 2400 | doc: /* Coding system for communicating with other X clients. |
| 2401 | When sending or receiving text via cut_buffer, selection, and clipboard, | 2401 | When sending or receiving text via cut_buffer, selection, and clipboard, |
| 2402 | the text is encoded or decoded by this coding system. | 2402 | the text is encoded or decoded by this coding system. |
| 2403 | The default value is `compound-text'. */); | 2403 | The default value is `compound-text-with-extensions'. */); |
| 2404 | Vselection_coding_system = intern ("compound-text"); | 2404 | Vselection_coding_system = intern ("compound-text-with-extensions"); |
| 2405 | 2405 | ||
| 2406 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, | 2406 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, |
| 2407 | doc: /* Coding system for the next communication with other X clients. | 2407 | doc: /* Coding system for the next communication with other X clients. |
| @@ -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_no_extensions = intern ("compound-text-no-extensions"); | 2438 | Qcompound_text_with_extensions = intern ("compound-text-with-extensions"); |
| 2439 | staticpro (&Qcompound_text_no_extensions); | 2439 | staticpro (&Qcompound_text_with_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); |