Mercurial > hg > xemacs-beta
diff src/xselect.c @ 169:15872534500d r20-3b11
Import from CVS: tag r20-3b11
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:46:53 +0200 |
| parents | 538048ae2ab8 |
| children | 8eaf7971accc |
line wrap: on
line diff
--- a/src/xselect.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/xselect.c Mon Aug 13 09:46:53 2007 +0200 @@ -367,7 +367,7 @@ int dataid; /* 1.2 wants long, but 1.1.5 wants int... */ #endif XmString fmh; - String encoding = (String) "STRING"; + String encoding = "STRING"; Extbyte *data = XSTRING_DATA (selection_value); Extcount bytes = XSTRING_LENGTH (selection_value); @@ -396,21 +396,17 @@ break; } - switch (chartypes) + if (chartypes == LATIN_1) + GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes); + else if (chartypes == WORLD) { - case LATIN_1: - GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes); - break; - case WORLD: GET_STRING_CTEXT_DATA_ALLOCA (selection_value, data, bytes); - encoding = (String) "COMPOUND_TEXT"; - break; + encoding = "COMPOUND_TEXT"; } } #endif /* MULE */ - fmh = XmStringCreateLtoR ((String) "Clipboard", - XmSTRING_DEFAULT_CHARSET); + fmh = XmStringCreateLtoR ("Clipboard", XmSTRING_DEFAULT_CHARSET); while (ClipboardSuccess != XmClipboardStartCopy (display, selecting_window, fmh, thyme, #ifdef MOTIF_INCREMENTAL_CLIPBOARDS_WORK @@ -1997,11 +1993,10 @@ break; } - switch (chartypes) - { - case LATIN_1: GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes); break; - case WORLD: GET_STRING_CTEXT_DATA_ALLOCA (string, data, bytes); break; - } + if (chartypes == LATIN_1) + GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes); + else if (chartypes == WORLD) + GET_STRING_CTEXT_DATA_ALLOCA (string, data, bytes); #endif /* MULE */ bytes_remaining = bytes;