2032c5e1b2
* Preserve character properties when typing. This fixes a bad regression that was introduced in 2.8.5. Changes 2.8.5: * Fix paste of rich text from HTML and ODT, where previously some formatting properties were not closed properly. * Add a number of robustness fixes to the layout engine. * Fix a table selection bug.
17 lines
669 B
Text
17 lines
669 B
Text
$NetBSD: patch-ab,v 1.17 2010/11/26 14:49:50 adam Exp $
|
|
|
|
--- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 00:52:27.000000000 +0000
|
|
+++ src/af/util/xp/ut_iconv.cpp
|
|
@@ -267,9 +267,11 @@ const char * ucs4Internal ()
|
|
#elif defined(_LIBICONV_H)
|
|
// libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
|
|
return "UCS-4-INTERNAL";
|
|
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
|
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
|
// we special case the BSDs since spelling just doesn't work
|
|
return "UCS4";
|
|
+#elif defined(__NetBSD__)
|
|
+ return "UCS-4";
|
|
#else
|
|
// general case, found by hub and dom
|
|
if (s_ucs4_internal == 0)
|