From f1a891a7dfc91588773e0484324f5eaf65cd7e1e Mon Sep 17 00:00:00 2001
From: skimo <skimo>
Date: Mon, 14 May 2001 15:50:22 +0000
Subject: [PATCH] actually use int2disp, although it probably will not be
 necessary

---
 cl/cl_funcs.c | 4 ++--
 common/conv.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cl/cl_funcs.c b/cl/cl_funcs.c
index 4072814c..94b1e62f 100644
--- a/cl/cl_funcs.c
+++ b/cl/cl_funcs.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_funcs.c,v 10.65 2001/04/24 21:47:44 skimo Exp $ (Berkeley) $Date: 2001/04/24 21:47:44 $";
+static const char sccsid[] = "$Id: cl_funcs.c,v 10.66 2001/05/14 15:50:22 skimo Exp $ (Berkeley) $Date: 2001/05/14 15:50:22 $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -60,7 +60,7 @@ addstr4(SCR *sp, void *str, size_t len, int wide)
 	    wchar_t *dstr;
 	    size_t dlen;
 	    INT2DISP(sp, str, len, dstr, dlen);
-	    if (waddnwstr(win, (wchar_t*) str, len) == ERR)
+	    if (waddnwstr(win, dstr, dlen) == ERR)
 		return (1);
 	} else 
 #endif
diff --git a/common/conv.c b/common/conv.c
index 550ab084..eaf091e5 100644
--- a/common/conv.c
+++ b/common/conv.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: conv.c,v 1.15 2001/05/13 09:05:06 skimo Exp $ (Berkeley) $Date: 2001/05/13 09:05:06 $";
+static const char sccsid[] = "$Id: conv.c,v 1.16 2001/05/14 15:50:23 skimo Exp $ (Berkeley) $Date: 2001/05/14 15:50:23 $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -254,7 +254,7 @@ err:
     return 1;
 }
 
-#ifdef HAVE_ADDNWSTR
+#ifdef USE_WIDECHAR
 int 
 default_int2disp (SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, 
 		size_t *tolen, char **dst)
@@ -275,7 +275,7 @@ default_int2disp (SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
 	    dest[j++] = str[i];
     *tolen = j;
 
-    *dst = cw.bp1;
+    *dst = cw->bp1;
 
     return 0;
 }
-- 
2.11.4.GIT