Mercurial > hg > xemacs-beta

comparison src/select-x.c @ 4985:358aa3bb603f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 12:12:28 -0600
parents f23cd0184dcf 3c3c1d139863
children 6c6d78781d59 8b2f75cecb89
comparison
equal deleted inserted replaced
4984:f23cd0184dcf 4985:358aa3bb603f
137 if (EQ (sym, QCUT_BUFFER7)) return XA_CUT_BUFFER7; 137 if (EQ (sym, QCUT_BUFFER7)) return XA_CUT_BUFFER7;
138 #endif /* CUT_BUFFER_SUPPORT */ 138 #endif /* CUT_BUFFER_SUPPORT */
139 139
140 { 140 {
141 const Extbyte *nameext; 141 const Extbyte *nameext;
142 LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), nameext, Qctext); 142 nameext = LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), Qctext);
143 return XInternAtom (display, nameext, only_if_exists ? True : False); 143 return XInternAtom (display, nameext, only_if_exists ? True : False);
144 } 144 }
145 } 145 }
146 146
147 147
186 Ibyte *intstr; 186 Ibyte *intstr;
187 Extbyte *str = XGetAtomName (display, atom); 187 Extbyte *str = XGetAtomName (display, atom);
188 188
189 if (! str) return Qnil; 189 if (! str) return Qnil;
190 190
191 TO_INTERNAL_FORMAT (C_STRING, str, 191 intstr = EXTERNAL_TO_ITEXT (str, Qctext);
192 C_STRING_ALLOCA, intstr,
193 Qctext);
194 XFree (str); 192 XFree (str);
195 return intern_istring (intstr); 193 return intern_istring (intstr);
196 } 194 }
197 } 195 }
198 196
337 chartypes = WORLD; 335 chartypes = WORLD;
338 break; 336 break;
339 } 337 }
340 338
341 if (chartypes == LATIN_1) 339 if (chartypes == LATIN_1)
342 TO_EXTERNAL_FORMAT (LISP_STRING, selection_value, 340 LISP_STRING_TO_SIZED_EXTERNAL (selection_value, data, bytes,
343 ALLOCA, (data, bytes), 341 Qbinary);
344 Qbinary);
345 else if (chartypes == WORLD) 342 else if (chartypes == WORLD)
346 { 343 {
347 TO_EXTERNAL_FORMAT (LISP_STRING, selection_value, 344 LISP_STRING_TO_SIZED_EXTERNAL (selection_value, data, bytes,
348 ALLOCA, (data, bytes), 345 Qctext);
349 Qctext);
350 encoding = "COMPOUND_TEXT"; 346 encoding = "COMPOUND_TEXT";
351 } 347 }
352 } 348 }
353 #endif /* MULE */ 349 #endif /* MULE */
354 350
1440 chartypes = WORLD; 1436 chartypes = WORLD;
1441 break; 1437 break;
1442 } 1438 }
1443 1439
1444 if (chartypes == LATIN_1) 1440 if (chartypes == LATIN_1)
1445 TO_EXTERNAL_FORMAT (LISP_STRING, string, 1441 LISP_STRING_TO_SIZED_EXTERNAL (string, data, bytes, Qbinary);
1446 ALLOCA, (data, bytes),
1447 Qbinary);
1448 else if (chartypes == WORLD) 1442 else if (chartypes == WORLD)
1449 TO_EXTERNAL_FORMAT (LISP_STRING, string, 1443 LISP_STRING_TO_SIZED_EXTERNAL (string, data, bytes, Qctext);
1450 ALLOCA, (data, bytes),
1451 Qctext);
1452 #endif /* MULE */ 1444 #endif /* MULE */
1453 1445
1454 bytes_remaining = bytes; 1446 bytes_remaining = bytes;
1455 1447
1456 while (bytes_remaining) 1448 while (bytes_remaining)