Sun Apr 14 20:55:42 2002 Michael Jennings (mej)

Changed occurances of "noenc" to the correct keyword, "none."  Thanks
to Laurence J. Lane <ljlane@debian.org> for pointing this one out
also.


SVN revision: 6131
This commit is contained in:
Michael Jennings 2002-04-14 23:56:59 +00:00
parent e5edaa19af
commit a42eb977bf
2 changed files with 11 additions and 5 deletions

View File

@ -4546,3 +4546,9 @@ Mon Apr 8 15:29:27 2002 Michael Jennings (mej)
Fixed a bug spotted by Laurence J. Lane <ljlane@debian.org> with color
settings not being properly saved.
----------------------------------------------------------------------
Sun Apr 14 20:55:42 2002 Michael Jennings (mej)
Changed occurances of "noenc" to the correct keyword, "none." Thanks
to Laurence J. Lane <ljlane@debian.org> for pointing this one out
also.
----------------------------------------------------------------------

View File

@ -141,10 +141,10 @@ const struct defaultfont defaultfont[] = {
{ ENC_EUCKR, "euckr",DEF_EUCKR, {NFONT_LIST_EUCKR}, {MFONT_LIST_EUCKR} },
{ ENC_UTF8, "iso-10646",DEF_10646,{NFONT_LIST_10646},{MFONT_LIST_10646} },
#endif /* MULTI_CHARSET */
{ ENC_ISO8859_7,"noenc",DEF_7, {NFONT_LIST_7}, {MFONT_LIST_NULL} },
{ ENC_KOI8R, "noenc",DEF_KOI8R, {NFONT_LIST_KOI8R}, {MFONT_LIST_NULL} },
{ ENC_KOI8U, "noenc",DEF_KOI8U, {NFONT_LIST_KOI8U}, {MFONT_LIST_NULL} },
{ ENC_DUMMY, "noenc",DEF_DUMMY, {MFONT_LIST_NULL}, {MFONT_LIST_NULL} }
{ ENC_ISO8859_7,"none",DEF_7, {NFONT_LIST_7}, {MFONT_LIST_NULL} },
{ ENC_KOI8R, "none",DEF_KOI8R, {NFONT_LIST_KOI8R}, {MFONT_LIST_NULL} },
{ ENC_KOI8U, "none",DEF_KOI8U, {NFONT_LIST_KOI8U}, {MFONT_LIST_NULL} },
{ ENC_DUMMY, "none",DEF_DUMMY, {MFONT_LIST_NULL}, {MFONT_LIST_NULL} }
};
/* special common rule for ISO-8859-x */
@ -262,7 +262,7 @@ eterm_default_font_locale(char ***fonts, char ***mfonts, char **mencoding, int *
*/
#ifdef MULTI_CHARSET
*mencoding = STRDUP("noenc");
*mencoding = STRDUP("none");
#endif
if (encoding >= ENC_ISO8859_1 && encoding <= ENC_ISO8859_LAST) {
/* fallback for ISO-8859-* encodings */