Mercurial > hg > xemacs-beta
diff src/select-x.c @ 4985:358aa3bb603f
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 12:12:28 -0600 |
| parents | f23cd0184dcf 3c3c1d139863 |
| children | 6c6d78781d59 8b2f75cecb89 |
line wrap: on
line diff
--- a/src/select-x.c Fri Feb 05 12:11:12 2010 -0600 +++ b/src/select-x.c Fri Feb 05 12:12:28 2010 -0600 @@ -139,7 +139,7 @@ { const Extbyte *nameext; - LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), nameext, Qctext); + nameext = LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), Qctext); return XInternAtom (display, nameext, only_if_exists ? True : False); } } @@ -188,9 +188,7 @@ if (! str) return Qnil; - TO_INTERNAL_FORMAT (C_STRING, str, - C_STRING_ALLOCA, intstr, - Qctext); + intstr = EXTERNAL_TO_ITEXT (str, Qctext); XFree (str); return intern_istring (intstr); } @@ -339,14 +337,12 @@ } if (chartypes == LATIN_1) - TO_EXTERNAL_FORMAT (LISP_STRING, selection_value, - ALLOCA, (data, bytes), - Qbinary); + LISP_STRING_TO_SIZED_EXTERNAL (selection_value, data, bytes, + Qbinary); else if (chartypes == WORLD) { - TO_EXTERNAL_FORMAT (LISP_STRING, selection_value, - ALLOCA, (data, bytes), - Qctext); + LISP_STRING_TO_SIZED_EXTERNAL (selection_value, data, bytes, + Qctext); encoding = "COMPOUND_TEXT"; } } @@ -1442,13 +1438,9 @@ } if (chartypes == LATIN_1) - TO_EXTERNAL_FORMAT (LISP_STRING, string, - ALLOCA, (data, bytes), - Qbinary); + LISP_STRING_TO_SIZED_EXTERNAL (string, data, bytes, Qbinary); else if (chartypes == WORLD) - TO_EXTERNAL_FORMAT (LISP_STRING, string, - ALLOCA, (data, bytes), - Qctext); + LISP_STRING_TO_SIZED_EXTERNAL (string, data, bytes, Qctext); #endif /* MULE */ bytes_remaining = bytes;