about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES12
-rw-r--r--README2
-rw-r--r--aclocal.m42
-rwxr-xr-xconfigure2
-rw-r--r--docs/OS-390.announce14
-rw-r--r--intl/makefile.in2
-rw-r--r--lynx.cfg3
-rw-r--r--lynx.hlp2
-rw-r--r--lynx.man2
-rw-r--r--lynx_help/Lynx_users_guide.html11
-rw-r--r--lynx_help/keystrokes/option_help.html2
-rw-r--r--makefile.bcb2
-rw-r--r--makefile.msc2
-rw-r--r--makelynx.bat2
-rw-r--r--src/LYCurses.c14
-rw-r--r--src/LYForms.c16
-rw-r--r--src/LYMain.c10
-rw-r--r--src/LYReadCFG.c2
-rw-r--r--src/LYStrings.c28
-rw-r--r--src/LYUtils.c2
-rw-r--r--userdefs.h12
21 files changed, 78 insertions, 66 deletions
diff --git a/CHANGES b/CHANGES
index 9512f7f3..20fc0f58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,18 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2000-04-17 (2.8.3pre.6)
+* change version number in remaining documentation to 2.8.3 -TD
+* remove redundant defines for SUPPORT_MULTIBYTE_EDIT and COLOR_TABLE from
+  DOS/Win32 makefiles -TD
+* small change to configure test for REAL_UNIX_SYSTEM to accommodate linkers
+  that allow assignment from a nonexistent extern.  Also, change a few UNIX
+  symbols in LYCurses.c and LYUtils.c to REAL_UNIX_SYSTEM to build on platforms
+  that do not define this symbol -TD
+* update notes in LYMain.c and LYReadCFG.c regarding the options and config
+  variable tables, which no longer need to be sorted -TD
+* htmlized lynx.cfg: add .h2 RULESFILE, remove confusing .h1 header -LP
+* define SUPPORT_MULTIBYTE_EDIT in userdefs.h -TH
 2000-04-13 (2.8.3pre.5)
 * fix printing of Last-Modified field in downloaded/printed source -LP
 * update URL for RFC 1942 -LV, DK
diff --git a/README b/README
index 5c60b575..cba4ffda 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
                              Lynx README file
 
-Lynx Version 2.8.2 is the latest release (June 1999).
+Lynx Version 2.8.3 is the latest release (April 2000).
 See the CHANGES file for a complete record of all changes and bug fixes.
 New releases are announced on the lynx-dev mailing list (see below).
 
diff --git a/aclocal.m4 b/aclocal.m4
index 95977810..33288036 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2015,7 +2015,7 @@ AC_TRY_LINK([#include <slang.h>],
 make an error
 #else
 extern int SLang_TT_Baud_Rate;
-int x = SLang_TT_Baud_Rate
+SLang_TT_Baud_Rate = 1
 #endif
 ],
 	[cf_cv_slang_unix=yes],
diff --git a/configure b/configure
index 86a82ffe..4cf319c1 100755
--- a/configure
+++ b/configure
@@ -8131,7 +8131,7 @@ int main() {
 make an error
 #else
 extern int SLang_TT_Baud_Rate;
-int x = SLang_TT_Baud_Rate
+SLang_TT_Baud_Rate = 1
 #endif
 
 ; return 0; }
diff --git a/docs/OS-390.announce b/docs/OS-390.announce
index 6eac7d25..8d748dc1 100644
--- a/docs/OS-390.announce
+++ b/docs/OS-390.announce
@@ -1,24 +1,24 @@
 This document suggests steps to install Lynx on OS/390 systems.
 
 ========================================================================
-o Download the archive file lynx2-8-2.tar.Z in BINARY from the site
+o Download the archive file lynx2-8-3.tar.Z in BINARY from the site
   where you found this announcement or from a site listed at
   http://lynx.browser.org/
 
 o Unpack with:
 
-	uncompress <lynx2-8-2.tar.Z | pax -rv -o to=IBM-1047
+	uncompress <lynx2-8-3.tar.Z | pax -rv -o to=IBM-1047
 
   The "-o to=IBM-1047" is needed to convert the ASCII archive
   to EBCDIC.  You must not download as a text file; the conversion
   must be performed after the uncompress.
 
 ========================================================================
-o Alternatively, download the PKZIPped archive lynx2-8-2.zip in BINARY.
+o Alternatively, download the PKZIPped archive lynx2-8-3.zip in BINARY.
 
 o Unpack with:
 
-	unzip -a lynx2.8.2.zip
+	unzip -a lynx2-8-3.zip
 
   The "-a" is needed to convert the ASCII archive
   to EBCDIC.  (unzip is not shipped with OS/390.  You can
@@ -38,7 +38,7 @@ o Run the configure script:
 	cd       ./OS390
 	rm -f config.cache
 	CC=c89 CFLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE" \
-	    ../lynx2-8-2/configure
+	    ../lynx2-8-3/configure
 
   The definitions select the ANSI C compiler (c89) and options
   to select the right header file directories.  You may also
@@ -64,8 +64,8 @@ o Build Lynx
 ========================================================================
 o Test Lynx:
 
-	./lynx -cfg=../lynx2-8-2/lynx.cfg \
-	    ../lynx2-8-2/lynx_help/lynx_help_main.html
+	./lynx -cfg=../lynx2-8-3/lynx.cfg \
+	    ../lynx2-8-3/lynx_help/lynx_help_main.html
 
 ========================================================================
 o Install Lynx:
diff --git a/intl/makefile.in b/intl/makefile.in
index 71a6b82d..719c2ecb 100644
--- a/intl/makefile.in
+++ b/intl/makefile.in
@@ -18,7 +18,7 @@
 # PACKAGE = @PACKAGE@
 PACKAGE = lynx
 # VERSION = @VERSION@
-VERSION = 2.8.2
+VERSION = 2.8.3
 
 SHELL = @CONFIG_SHELL@
 CDPATH = .
diff --git a/lynx.cfg b/lynx.cfg
index 46909cf6..2158d661 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1232,7 +1232,6 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 
 
 .h1 Mail-related
-# The settings control mailing facilities of lynx.
 
 .h2 SYSTEM_MAIL
 .h2 SYSTEM_MAIL_FLAGS
@@ -2815,6 +2814,7 @@ MINIMAL_COMMENTS:TRUE
 .h1 Internal Behavior
 
 .h2 RULE
+.h2 RULESFILE
 # CERN-style rules, EXPERIMENTAL  -  URL-specific rules
 #
 # A CERN-style rules file can be given with RULESFILE.  Use the system's
@@ -2828,6 +2828,7 @@ MINIMAL_COMMENTS:TRUE
 # in the samples subdirectory for further explanation.
 #
 # Examples:
+.ex 5
 #	RULESFILE:/etc/lynx/cernrules
 #	RULE:Fail	gopher:*		     # reject by scheme
 #	RULE:Pass	finger://*@localhost/	     # allow this,
diff --git a/lynx.hlp b/lynx.hlp
index c2f6cb3a..b2a86c7e 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -891,7 +891,7 @@
                            path prefix for message catalogs.
 
 2 NOTES
-       This is the Lynx v2.8.2 Release
+       This is the Lynx v2.8.3 Release
 
        If  you  wish  to contribute to the further development of
        Lynx, subscribe  to  our  mailing  list.   Send  email  to
diff --git a/lynx.man b/lynx.man
index 0db62a2b..fc873e3a 100644
--- a/lynx.man
+++ b/lynx.man
@@ -864,7 +864,7 @@ codes.  Currently, it is hard-coded to a wish list.
 .B NLSPATH
 This variable, if set, is used as the path prefix for message catalogs.
 .SH NOTES
-This is the Lynx v2.8.2 Release
+This is the Lynx v2.8.3 Release
 .PP
 If you wish to contribute to the further development
 of \fILynx\fR, subscribe to our mailing list.  Send email to
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 1353ec62..c3f3de89 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html public "-//IETF//DTD HTML 3.0//EN">
 <html>
 <head>
-<title>Lynx Users Guide v2.8.2</title>
+<title>Lynx Users Guide v2.8.3</title>
 <link rev="made" href="mailto:lynx-dev@sig.net">
 </head>
 
 <body>
-<h1>Lynx Users Guide v2.8.2</h1>
+<h1>Lynx Users Guide v2.8.3</h1>
 
 Lynx is a fully-featured <em>World Wide Web</em> (<em>WWW</em>) client
 for users running cursor-addressable, character-cell display devices (e.g.,
@@ -489,7 +489,7 @@ The form-based menu shown below is an HTML file generated at runtime,
 in which the user fills in choices as in any ordinary HTML form.
 <pre>
 
-                    Options Menu (Lynx Version 2.8.2pre.6)
+                    Options Menu (Lynx Version 2.8.3pre.6)
 
       Accept Changes - Reset Changes Left Arrow cancels changes <A
 HREF="keystrokes/option_help.html">HELP!</A>
@@ -544,7 +544,7 @@ and is accessed by setting FORMS_OPTIONS to TRUE in
 <A HREF="#lynx.cfg">lynx.cfg</A>.
 <pre>
 
-             Options Menu (Lynx Version 2.8.2pre.6)
+             Options Menu (Lynx Version 2.8.3pre.6)
 
      (E)ditor                     : emacs
      (D)ISPLAY variable           : aixtest.cc.ukans.edu:0.0
@@ -882,7 +882,7 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
         <dd>The header string which Lynx sends to HTTP servers to indicate the
             User-Agent is displayed here.  Changes may be disallowed via
             the <em>-restrictions</em> switch.  Otherwise, the header can be
-            changed temporarily to a string such as <em>L_y_n_x/2.8.2</em>
+            changed temporarily to a string such as <em>L_y_n_x/2.8.3</em>
             for access to sites which discriminate against Lynx based on
             checks for the presence of &quot;Lynx&quot; in the header.  If
             the User-Agent header has been changed, it can
@@ -2824,6 +2824,7 @@ The v2-7-1FM code set was released as v2.7.2 in January 1998.<br>
 The 2.7.1 development set was released as v2.8 in March 1998.<br>
 The 2.8 development set was released as v2.8.1 in October 1998.<br>
 The 2.8.1 development set was released as v2.8.2 in June 1999.<br>
+The 2.8.2 development set was released as v2.8.3 in April 2000.<br>
 
 <p>Since early 1997, the Lynx code has expanded into autoconfigure and
 PC versions.  The branching of the Lynx source base from a single
diff --git a/lynx_help/keystrokes/option_help.html b/lynx_help/keystrokes/option_help.html
index a5b50e04..24893608 100644
--- a/lynx_help/keystrokes/option_help.html
+++ b/lynx_help/keystrokes/option_help.html
@@ -373,7 +373,7 @@ e.g., <kbd>da, en-gb;q=0.8, en;q=0.7</kbd> .
 
 The header string which Lynx sends to servers to indicate the User-Agent
 is displayed here.  Changes may be disallowed via the -restrictions switch.
-Otherwise, the header can be changed temporarily to e.g., L_y_n_x/2.8.2
+Otherwise, the header can be changed temporarily to e.g., L_y_n_x/2.8.3
 for access to sites which discriminate against Lynx based on checks
 for the presence of `Lynx' in the header.  If changed during a Lynx session,
 the default User-Agent header can be restored by deleting the modified string
diff --git a/makefile.bcb b/makefile.bcb
index 8be8ca0c..3fbb0bc9 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -49,12 +49,10 @@ CC_FLAGS = $(DEBUG) \
 -DNOUSERS \
 -DFANCY_CURSES \
 -DCOLOR_CURSES \
--DUSE_COLOR_TABLE \
 -DHAVE_KEYPAD \
 -DUSE_EXTERNALS \
 -DUSE_ZLIB \
 -DPDCURSES \
--DSUPPORT_MULTIBYTE_EDIT \
 -DUSE_MULTIBYTE_CURSES \
 -DLONG_LIST \
 -DDISP_PARTIAL \
diff --git a/makefile.msc b/makefile.msc
index 41ef907c..54fb2476 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -50,8 +50,6 @@ DEFS = $(CS_DEFS) \
  /D "PDCURSES" \
  /D "SOURCE_CACHE" \
  /D "SH_EX" \
- /D "SUPPORT_MULTIBYTE_EDIT" \
- /D "USE_COLOR_TABLE" \
  /D "USE_EXTERNALS" \
  /D "USE_MULTIBYTE_CURSES" \
  /D "USE_PRETTYSRC" \
diff --git a/makelynx.bat b/makelynx.bat
index 3cbce2a2..38440e83 100644
--- a/makelynx.bat
+++ b/makelynx.bat
@@ -48,9 +48,7 @@ goto endif1
 :else1

 SET DEFINES=%DEFINES% -DFANCY_CURSES

 SET DEFINES=%DEFINES% -DCOLOR_CURSES

-SET DEFINES=%DEFINES% -DUSE_COLOR_TABLE

 SET DEFINES=%DEFINES% -DPDCURSES

-SET DEFINES=%DEFINES% -DSUPPORT_MULTIBYTE_EDIT

 SET DEFINES=%DEFINES% -DUSE_MULTIBYTE_CURSES

 :endif1

 SET DEFINES=%DEFINES% -DUSE_EXTERNALS

diff --git a/src/LYCurses.c b/src/LYCurses.c
index 5fbd864e..75727790 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -180,7 +180,7 @@ PRIVATE void sl_suspend ARGS1(
     SLang_init_tty(3, 0, 1);
 #endif /* SLANG_VERSION > 9929 */
     signal(SIGTSTP, sl_suspend);
-#if defined(UNIX) && !defined(__CYGWIN__)
+#if defined(REAL_UNIX_SYSTEM) && !defined(__CYGWIN__)
     SLtty_set_suspend_state(1);
 #endif
     if (sig == SIGTSTP)
@@ -680,11 +680,11 @@ PUBLIC void start_curses NOARGS
 	SLkp_init ();
 #endif /* __DJGPP__ && !DJGPP_KEYHANDLER */
 
-#if defined(UNIX) && !defined(__CYGWIN__)
+#if defined(REAL_UNIX_SYSTEM) && !defined(__CYGWIN__)
 #if SLANG_VERSION >= 9935
 	SLang_TT_Read_FD = fileno(stdin);
 #endif /* SLANG_VERSION >= 9935 */
-#endif /* UNIX && !__CYGWIN__ */
+#endif /* REAL_UNIX_SYSTEM && !__CYGWIN__ */
 
 #if !defined(USE_KEYMAPS) && defined(ENHANCED_LINEEDIT) && defined(ESCDELAY)
 	/* way to get ESC that's not part of a recognized sequence through */
@@ -720,7 +720,7 @@ PUBLIC void start_curses NOARGS
 	}
 	size_change(0);
 
-#if (defined(VMS) || defined(UNIX)) && !defined(__CYGWIN__)
+#if (defined(VMS) || defined(REAL_UNIX_SYSTEM)) && !defined(__CYGWIN__)
 	if ((Masked_Attr & SLTT_ULINE_MASK) == 0) {
 	    SLtt_add_color_attribute(4, SLTT_ULINE_MASK);
 	    SLtt_add_color_attribute(5, SLTT_ULINE_MASK);
@@ -734,7 +734,7 @@ PUBLIC void start_curses NOARGS
 	} else {
 	    SLtt_Blink_Mode = 0;
 	}
-#endif /* (VMS || UNIX) && !__CYGWIN__  */
+#endif /* (VMS || REAL_UNIX_SYSTEM) && !__CYGWIN__  */
     }
 #ifdef __DJGPP__
 #ifdef WATT32
@@ -760,9 +760,9 @@ PUBLIC void start_curses NOARGS
     scrollok(0,0);
     SLsmg_Backspace_Moves = 1;
 #ifndef VMS
-#if defined(UNIX) && !defined(__CYGWIN__)
+#if defined(REAL_UNIX_SYSTEM) && !defined(__CYGWIN__)
     SLtty_set_suspend_state(1);
-#endif /* UNIX && !__CYGWIN__ */
+#endif /* REAL_UNIX_SYSTEM && !__CYGWIN__ */
 #ifdef SIGTSTP
     if (!no_suspend)
 	signal(SIGTSTP, sl_suspend);
diff --git a/src/LYForms.c b/src/LYForms.c
index 3f2538f0..17c65d5d 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -353,7 +353,7 @@ PRIVATE int form_getstr ARGS3(
     int action, repeat;
     int last_xlkc = -1;
 #ifdef SUPPORT_MULTIBYTE_EDIT
-    BOOL refresh = TRUE;
+    BOOL refresh_mb = TRUE;
 #endif
 
     EditFieldData MyEdit;
@@ -446,10 +446,10 @@ again:
 	ch = LYgetch_for(FOR_INPUT);
 #ifdef SUPPORT_MULTIBYTE_EDIT
 #ifdef WIN_EX
-	if (!refresh && (EditBinding(ch) != LYE_CHAR))
+	if (!refresh_mb && (EditBinding(ch) != LYE_CHAR))
 	    goto again;
 #else
-	if (!refresh &&
+	if (!refresh_mb &&
 	    (EditBinding(ch) != LYE_CHAR) && (EditBinding(ch) != LYE_AIX))
 	    goto again;
 #endif
@@ -711,12 +711,12 @@ again:
 #else /* SUPPORT_MULTIBYTE_EDIT */
 		    if (LYLineEdit(&MyEdit, ch, TRUE) == 0) {
 			if (HTCJK != NOCJK && (0x80 <= ch)
-			&& (ch <= 0xfe) && refresh)
-			    refresh = FALSE;
+			&& (ch <= 0xfe) && refresh_mb)
+			    refresh_mb = FALSE;
 			else
-			    refresh = TRUE;
+			    refresh_mb = TRUE;
 		    } else {
-			if (!refresh) {
+			if (!refresh_mb) {
 			    LYEdit1(&MyEdit, 0, LYE_DELP, TRUE);
 			}
 		    }
@@ -733,7 +733,7 @@ again:
 		    Edited = TRUE;
 		}
 #ifdef SUPPORT_MULTIBYTE_EDIT
-		if (refresh)
+		if (refresh_mb)
 #endif
 		LYRefreshEdit(&MyEdit);
 		LYSetLastTFPos(MyEdit.pos);
diff --git a/src/LYMain.c b/src/LYMain.c
index c5cb0af9..94ca4c5e 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -3095,7 +3095,7 @@ static int width_fun ARGS1(
     return 0;
 }
 
-/* NOTE: This table is sorted by name; the lookup relies on that. */
+/* NOTE: This table is sorted by name to make the help message useful */
 static Parse_Args_Type Arg_Table [] =
 {
    PARSE_SET(
@@ -3180,10 +3180,6 @@ static Parse_Args_Type Arg_Table [] =
       "=FORMAT\nconvert input, FORMAT is in MIME type notation (experimental)"
    ),
 #endif
-   PARSE_SET(
-      "cookies",	TOGGLE_ARG,		&LYSetCookies,
-      "toggles handling of Set-Cookie headers"
-   ),
 #ifdef EXP_PERSISTENT_COOKIES
    PARSE_STR(
       "cookie_file",	LYSTRING_ARG,		&LYCookieFile,
@@ -3194,6 +3190,10 @@ static Parse_Args_Type Arg_Table [] =
       "=FILENAME\nspecifies a file to use to store cookies"
    ),
 #endif /* EXP_PERSISTENT_COOKIES */
+   PARSE_SET(
+      "cookies",	TOGGLE_ARG,		&LYSetCookies,
+      "toggles handling of Set-Cookie headers"
+   ),
 #ifndef VMS
    PARSE_SET(
       "core",		TOGGLE_ARG,		&LYNoCore,
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 772bb7ee..d905a32b 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1327,7 +1327,7 @@ static int read_htmlsrc_tagname_xform ARGS1( char*,str)
 }
 #endif
 
-/* This table should be sorted alphabetically, ignoring case */
+/* This table is searched ignoring case */
 static Config_Type Config_Table [] =
 {
      PARSE_SET("accept_all_cookies", CONF_BOOL, &LYAcceptAllCookies),
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 65ecc5b6..ecc6effe 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -38,10 +38,6 @@
 extern unsigned short *LYKbLayout;
 extern BOOL HTPassHighCtrlRaw;
 
-#ifdef SUPPORT_MULTIBYTE_EDIT
-#define IS_KANA(c)	(0xa0 <= c && c <= 0xdf)
-#endif
-
 #if defined(WIN_EX)
 #undef  BUTTON_CTRL
 #define BUTTON_CTRL	0	/* Quick hack */
@@ -2314,7 +2310,7 @@ PUBLIC void LYLowerCase ARGS1(
 #ifdef SUPPORT_MULTIBYTE_EDIT	/* 1998/11/23 (Mon) 17:04:55 */
     {
 	if (buffer[i] & 0x80) {
-	    if (IS_KANA(buffer[i])) {
+	    if ((kanji_code == SJIS) && IS_SJIS_X0201KANA((unsigned char)(buffer[i]))) {
 		continue;
 	    }
 	    i++;
@@ -2339,7 +2335,7 @@ PUBLIC void LYUpperCase ARGS1(
 #ifdef SUPPORT_MULTIBYTE_EDIT	/* 1998/11/23 (Mon) 17:05:10 */
     {
 	if (buffer[i] & 0x80) {
-	    if (IS_KANA(buffer[i])) {
+	    if ((kanji_code == SJIS) && IS_SJIS_X0201KANA((unsigned char)(buffer[i]))) {
 		continue;
 	    }
 	    i++;
@@ -2540,8 +2536,8 @@ PRIVATE int prev_pos ARGS2(
 	while (i < pos - 1) {
 	    int c;
 	    c = Buf[i];
-
-	    if (!(isascii(c) || IS_KANA(c))) {
+	    if (!(isascii(c) ||
+		  ((kanji_code == SJIS) && IS_SJIS_X0201KANA((unsigned char)c)))) {
 		i++;
 	    }
 	    i++;
@@ -3207,7 +3203,7 @@ PUBLIC int LYgetstr ARGS4(
     EditFieldData MyEdit;
     char *res;
 #ifdef SUPPORT_MULTIBYTE_EDIT
-    BOOL refresh = TRUE;
+    BOOL refresh_mb = TRUE;
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 
     LYGetYX(y, x);		/* Use screen from cursor position to eol */
@@ -3221,17 +3217,17 @@ again:
 #ifndef SUPPORT_MULTIBYTE_EDIT
 	LYRefreshEdit(&MyEdit);
 #else /* SUPPORT_MULTIBYTE_EDIT */
-	if (refresh)
+	if (refresh_mb)
 	    LYRefreshEdit(&MyEdit);
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 	ch = LYgetch_for(FOR_PROMPT);
 #ifdef SUPPORT_MULTIBYTE_EDIT
 #ifdef CJK_EX	/* for SJIS code */
-	if (!refresh
+	if (!refresh_mb
 	 && (EditBinding(ch) != LYE_CHAR))
 	    goto again;
 #else
-	if (!refresh
+	if (!refresh_mb
 	 && (EditBinding(ch) != LYE_CHAR)
 	 && (EditBinding(ch) != LYE_AIX))
 	    goto again;
@@ -3393,12 +3389,12 @@ again:
 	    LYLineEdit(&MyEdit, ch, FALSE);
 #else /* SUPPORT_MULTIBYTE_EDIT */
 	    if (LYLineEdit(&MyEdit, ch, FALSE) == 0) {
-		if (refresh && HTCJK != NOCJK && (0x81 <= ch) && (ch <= 0xfe))
-		    refresh = FALSE;
+		if (refresh_mb && HTCJK != NOCJK && (0x81 <= ch) && (ch <= 0xfe))
+		    refresh_mb = FALSE;
 		else
-		    refresh = TRUE;
+		    refresh_mb = TRUE;
 	    } else {
-		if (!refresh) {
+		if (!refresh_mb) {
 		    LYEdit1(&MyEdit, 0, LYE_DELP, FALSE);
 		}
 	    }
diff --git a/src/LYUtils.c b/src/LYUtils.c
index ceadb9cf..89008bcc 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -2164,7 +2164,7 @@ PUBLIC int LYConsoleInputFD ARGS1(
 #ifdef USE_SLANG
     if (!LYCursesON)
 	fd = fileno(stdin);
-#if ((SLANG_VERSION >= 9919) && defined(UNIX) && !defined(__CYGWIN__))
+#if ((SLANG_VERSION >= 9919) && defined(REAL_UNIX_SYSTEM) && !defined(__CYGWIN__))
     /* SLang_TT_Read_FD introduced in slang 0.99.19, from its changelog:
      *   SLang_TT_Read_FD variable is now available for unix.  This is the file
      *   descriptor used by SLang_getkey. */
diff --git a/userdefs.h b/userdefs.h
index 969f74ae..8503685f 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1339,12 +1339,12 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.3pre.5"
+#define LYNX_VERSION "2.8.3pre.6"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 #define LYNX_RELEASE FALSE
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Thu, 13 Apr 2000 19:39:31 -0700"
+#define LYNX_DATE "Mon, 17 Apr 2000 03:59:17 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 #define LYNX_RELEASE_DATE "1999"
@@ -1442,6 +1442,14 @@
 
 
 /***************************** 
+ * SUPPORT_MULTIBYTE_EDIT provides better support of CJK characters to
+ * Lynx's Line Editor.  JIS X0201 Kana is partially supported.  The
+ * reason why I didn't support it fully is I think supporting it is not
+ * required so much and I don't have an environment to test it. - TH
+ */
+#define SUPPORT_MULTIBYTE_EDIT
+
+/*****************************
  * USE_TH_JP_AUTO_DETECT, CONV_JISX0201KANA_JISX0208KANA,  
  * and KANJI_CODE_OVERRIDE are the macros for Japanese. - TH 
  */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-11 08:49:42 +0000