--- less-358/defines.h.in.chset	Sat Jun 23 16:06:58 2001
+++ less-358/defines.h.in	Sat Jun 23 16:04:48 2001
@@ -183,7 +183,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/defines.h.top.chset	Sat Jun 23 16:02:34 2001
+++ less-358/defines.h.top	Sat Jun 23 16:05:06 2001
@@ -182,7 +182,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/defines.ds.chset	Sat Jun 23 16:06:47 2001
+++ less-358/defines.ds	Sat Jun 23 16:04:37 2001
@@ -202,7 +202,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/defines.o2.chset	Sat Jun 23 16:07:56 2001
+++ less-358/defines.o2	Sat Jun 23 16:05:32 2001
@@ -183,7 +183,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/defines.o9.chset	Sat Jun 23 16:02:51 2001
+++ less-358/defines.o9	Sat Jun 23 16:08:12 2001
@@ -196,7 +196,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/defines.wn.chset	Sat Jun 23 16:02:51 2001
+++ less-358/defines.wn	Sat Jun 23 16:08:22 2001
@@ -184,7 +184,7 @@
  * The value of this must equal one of the available value which can use as
  * LESSCHARSET environment variable
  */
-#define	DEFCHARSET	"iso8"
+#define	DEFCHARSET	"latin1"
 
 /*
  * DEFPLANESET is name of the default plane set of iso 2022 extension.
--- less-358/charset.c.chset	Sat Jun 23 16:03:06 2001
+++ less-358/charset.c	Sat Jun 23 16:03:43 2001
@@ -387,6 +387,8 @@
 	}
 #endif
 
+	/* nothing else found yet, fallback to default: */
+	(void) icharset(DEFCHARSET);
 	setlocale(LC_ALL, "");
 	for (c = 0;  c < (int) sizeof(chardef);  c++)
 	{
@@ -397,6 +399,7 @@
 		else
 			chardef[c] = IS_BINARY_CHAR|IS_CONTROL_CHAR;
 	}
+	
 }
 #endif
 
@@ -433,17 +436,21 @@
 	public void
 init_planeset()
 {
-	char *s;
-
 #if ISO
-	s = lgetenv("JLESSPLANESET");
-	if (s == NULL)
-		s = DEFPLANESET;
-	if (set_planeset(s) < 0)
+	char *s, *t;
+
+	t = lgetenv("JLESSCHARSET");
+	if (t != NULL)
 	{
-		error("invalid plane set", NULL_PARG);
-		quit(1);
-		/*NOTREACHED*/
+		s = lgetenv("JLESSPLANESET");
+		if (s == NULL)
+			s = DEFPLANESET;
+		if (set_planeset(s) < 0)
+		{
+			error("invalid plane set", NULL_PARG);
+			quit(1);
+			/*NOTREACHED*/
+		}
 	}
 #endif
 }