Force ISO-8859-8 for Hebrew users

diff --git a/src/text/wincp.c b/src/text/wincp.c
index 318b5e6a7edfada46f294a232a3c2f361a9f576b..fe82f4a63abd0a9f3bf4297b8f60faab0e3fc52b 100644 (file)
--- a/src/text/wincp.c
+++ b/src/text/wincp.c
@@ -97,7 +97,7 @@ static const char *FindFallbackEncoding (const char *locale)
 
     /* Hebrew (ISO-8859-8) */
     if (!locale_match ("he" "iw" "yi", locale))
-        return "CP1255"; // Compatible Microsoft superset
+        return "ISO-8859-8"; // CP1255 is reportedly screwed up
 
     /* Latin-5 Turkish (ISO-8859-9) */
     if (!locale_match ("tr" "ku", locale))
@@ -204,8 +204,20 @@ const char *GetFallbackEncoding( void )
     return FindFallbackEncoding (psz_lang);
 #else
     static char buf[16] = "";
+
     if (buf[0] == 0)
-        snprintf (buf, sizeof (buf), "CP%u", GetACP ());
+    {
+        int cp = GetACP ();
+
+        switch (cp)
+        {
+            case 1255: // Hebrew, CP1255 screws up somewhat
+                strcpy (buf, "ISO-8859-8");
+                break;
+            default:
+                snprintf (buf, sizeof (buf), "CP%u", GetACP ());
+        }
+    }
     return buf;
 #endif
 }