From a7f2fe43f2f765c6435b776e946baece1d4f0570 Mon Sep 17 00:00:00 2001 From: sobomax Date: Thu, 10 May 2001 21:04:36 +0000 Subject: Sync KOI8-U with latest KOI8-R changes. Also restore correct numbering in the font selection dialog broken by the removal of KOI8-R. Prompted by: ache MFC after: 2 weeks --- usr.sbin/sade/menus.c | 8 +++----- usr.sbin/sysinstall/menus.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index a3d898f..e2df43c 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -1592,15 +1592,13 @@ DMenu MenuSysconsFont = { "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" }, { "5 IBM 866", "Russian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16,mousechar_start=3" }, - { "6 IBM 866u", "Ukrainian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, - "font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" }, + { "6 IBM 866u", "Ukrainian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16,mousechar_start=3" }, { "7 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, { "8 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" }, - { "0 KOI8-U", "Ukrainian, KOI8-U encoding", dmenuVarCheck, dmenuSetVariables, NULL, - "font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" }, - { "S SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "9 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index a3d898f..e2df43c 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1592,15 +1592,13 @@ DMenu MenuSysconsFont = { "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" }, { "5 IBM 866", "Russian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16,mousechar_start=3" }, - { "6 IBM 866u", "Ukrainian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, - "font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" }, + { "6 IBM 866u", "Ukrainian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16,mousechar_start=3" }, { "7 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, { "8 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" }, - { "0 KOI8-U", "Ukrainian, KOI8-U encoding", dmenuVarCheck, dmenuSetVariables, NULL, - "font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" }, - { "S SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "9 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; -- cgit v1.1