X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/7b56a33fca0f6c9130188db0d2eb475de9380b02..93511b79b8f756347a81cf174ed99bf900d81042:/unix/uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index 9d8242f8..5d3d5af0 100644
--- a/unix/uxucs.c
+++ b/unix/uxucs.c
@@ -253,17 +253,19 @@ const char *cp_name(int codepage)
 const char *cp_enumerate(int index)
 {
     int charset;
-    if (index == 0)
-	return "Use font encoding";
-    charset = charset_localenc_nth(index-1);
-    if (charset == CS_NONE)
+    charset = charset_localenc_nth(index);
+    if (charset == CS_NONE) {
+        /* "Use font encoding" comes after all the named charsets */
+        if (charset_localenc_nth(index-1) != CS_NONE)
+            return "Use font encoding";
 	return NULL;
+    }
     return charset_to_localenc(charset);
 }
 
 int decode_codepage(char *cp_name)
 {
-    if (!*cp_name)
-	return CS_NONE;		       /* use font encoding */
+    if (!cp_name || !*cp_name)
+	return CS_UTF8;
     return charset_from_localenc(cp_name);
 }