Sun Apr 26 00:21:12 1998 Norbert Warmuth <k3190@fh-sw.de>

* slint.c: Applied the patch from Bill Nottingham <wen1@cec.wustl.edu>
to make it link against SLang >=1.0.
I reviewed the diffs to the part of SLang we use and there are no
further changes to MC necessary (one function's return value
changed it's meaning but we don't use this return value).

* configure.in: Undone the change which prevented linkage against
SLang >=1.0

configure.in

@@ -981,11 +981,7 @@ AC_DEFUN(AC_USE_TERMCAP,
 slang_check_lib=true
 slang_term=""
 slang_use_system_installed_lib=false
-
-dnl Checking for SLsys_getkey will fail for SLang >= 1.0, i.e. we don't
-dnl use SLang >= 1.0 at the moment because I haven't reviewed which changes
-dnl to MC are necessary (Norbert)
-AC_CHECK_LIB(slang,SLsys_getkey,
+AC_CHECK_LIB(slang,SLang_init_tty,
 	AC_CHECK_HEADERS(slang.h)
 	if test x$ac_cv_header_slang_h = xyes
 	then

src/ChangeLog

@@ -1,3 +1,14 @@
+Sun Apr 26 00:21:12 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* slint.c: Applied the patch from Bill Nottingham <wen1@cec.wustl.edu> 
+	to make it link against SLang >=1.0. 
+	I reviewed the diffs to the part of SLang we use and there are no 
+	further changes to MC necessary (one function's return value
+	changed it's meaning but we don't use this return value).
+
+	* configure.in: Undone the change which prevented linkage against
+	SLang >=1.0
+
 Sat Apr 25 13:41:43 1998  Paul Sheer  <psheer@obsidian.co.za>
 
 	* edit.h, syntax.h: some optimisations to improve syntax

src/slint.c

@@ -74,8 +74,13 @@ static int no_slang_delay;
 /* {{{  Copied from ../slang/slgetkey.c, removed the DEC_8Bit_HACK, */
 extern unsigned int SLang_Input_Buffer_Len;
 extern unsigned char SLang_Input_Buffer [];
+#if SLANG_VERSION >= 10000
+extern unsigned int _SLsys_getkey (void);
+extern int _SLsys_input_pending (int);
+#else
 extern unsigned int SLsys_getkey (void);
 extern int SLsys_input_pending (int);
+#endif
 
 static unsigned int SLang_getkey2 (void)
 {
@@ -92,7 +97,11 @@ static unsigned int SLang_getkey2 (void)
 		(char *) (SLang_Input_Buffer + 1), imax);
 	return(ch);
      }
-   else return(SLsys_getkey ());
+#if SLANG_VERSION >= 10000
+   else return(_SLsys_getkey ());
+#else
+   else return(SLsys_getkey());
+#endif
 }
 
 static int SLang_input_pending2 (int tsecs)
@@ -100,9 +109,11 @@ static int SLang_input_pending2 (int tsecs)
    int n;
    unsigned char c;
    if (SLang_Input_Buffer_Len) return (int) SLang_Input_Buffer_Len;
-   
+#if SLANG_VERSION >= 10000  
+   n = _SLsys_input_pending (tsecs);
+#else
    n = SLsys_input_pending (tsecs);
-   
+#endif
    if (n <= 0) return 0;
    
    c = (unsigned char) SLang_getkey2 ();