/[emacs]/emacs/src/xselect.c
ViewVC logotype

Diff of /emacs/src/xselect.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.105 by gerd, Thu Jul 12 14:38:51 2001 UTC revision 1.105.4.1 by eliz, Fri Feb 22 10:42:23 2002 UTC
# Line 97  Lisp_Object QPRIMARY, QSECONDARY, QSTRIN Line 97  Lisp_Object QPRIMARY, QSECONDARY, QSTRIN
97    
98  Lisp_Object QCOMPOUND_TEXT;     /* This is a type of selection.  */  Lisp_Object QCOMPOUND_TEXT;     /* This is a type of selection.  */
99    
100    Lisp_Object Qcompound_text_with_extensions;
101    
102  #ifdef CUT_BUFFER_SUPPORT  #ifdef CUT_BUFFER_SUPPORT
103  Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,  Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
104    QCUT_BUFFER4, QCUT_BUFFER5, QCUT_BUFFER6, QCUT_BUFFER7;    QCUT_BUFFER4, QCUT_BUFFER5, QCUT_BUFFER6, QCUT_BUFFER7;
# Line 1650  selection_data_to_lisp_data (display, da Line 1652  selection_data_to_lisp_data (display, da
1652            str = make_string_from_bytes ((char *) buf,            str = make_string_from_bytes ((char *) buf,
1653                                          coding.produced_char, coding.produced);                                          coding.produced_char, coding.produced);
1654            xfree (buf);            xfree (buf);
1655    
1656              if (SYMBOLP (coding.post_read_conversion)
1657                  && !NILP (Ffboundp (coding.post_read_conversion)))
1658                str = run_pre_post_conversion_on_str (str, coding, 0);
1659            Vlast_coding_system_used = coding.symbol;            Vlast_coding_system_used = coding.symbol;
1660          }          }
1661        compose_chars_in_text (0, XSTRING (str)->size, str);        compose_chars_in_text (0, XSTRING (str)->size, str);
# Line 1756  lisp_data_to_selection_data (display, ob Line 1762  lisp_data_to_selection_data (display, ob
1762          Vnext_selection_coding_system = Vselection_coding_system;          Vnext_selection_coding_system = Vselection_coding_system;
1763    
1764        *format_ret = 8;        *format_ret = 8;
1765        *data_ret = x_encode_text (obj, Vnext_selection_coding_system,        *data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
1766                                   (int *) size_ret, &stringp);                                   (int *) size_ret, &stringp);
1767        *nofree_ret = (*data_ret == XSTRING (obj)->data);        *nofree_ret = (*data_ret == XSTRING (obj)->data);
1768        if (NILP (type))        if (EQ (Vnext_selection_coding_system,
1769                  Qcompound_text_with_extensions))
1770            type = QCOMPOUND_TEXT;
1771          else if (NILP (type))
1772          type = (stringp ? QSTRING : QCOMPOUND_TEXT);          type = (stringp ? QSTRING : QCOMPOUND_TEXT);
1773        Vlast_coding_system_used = (*nofree_ret        Vlast_coding_system_used = (*nofree_ret
1774                                    ? Qraw_text                                    ? Qraw_text
# Line 2426  A value of 0 means wait as long as neces Line 2435  A value of 0 means wait as long as neces
2435    QATOM      = intern ("ATOM");         staticpro (&QATOM);    QATOM      = intern ("ATOM");         staticpro (&QATOM);
2436    QATOM_PAIR = intern ("ATOM_PAIR");    staticpro (&QATOM_PAIR);    QATOM_PAIR = intern ("ATOM_PAIR");    staticpro (&QATOM_PAIR);
2437    QNULL      = intern ("NULL");         staticpro (&QNULL);    QNULL      = intern ("NULL");         staticpro (&QNULL);
2438      Qcompound_text_with_extensions = intern ("compound-text-with-extensions");
2439      staticpro (&Qcompound_text_with_extensions);
2440    
2441  #ifdef CUT_BUFFER_SUPPORT  #ifdef CUT_BUFFER_SUPPORT
2442    QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);    QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);

Legend:
Removed from v.1.105  
changed lines
  Added in v.1.105.4.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26