View | Details | Raw Unified | Return to bug 220013 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-common-multibyte.c (-3 / +5 lines)
Lines 1-8 Link Here
1 
--- ../common/multibyte.c.orig	2017-01-07 18:04:20.087312000 +0900
 1 
--- ../common/multibyte.c.orig	2017-11-17 21:47:04.305764000 +0900
2 
+++ ../common/multibyte.c	2017-01-07 18:05:53.585988000 +0900
 2 
+++ ../common/multibyte.c	2017-11-17 21:58:19.218532000 +0900
3 
@@ -1455,7 +1455,7 @@
 3 
@@ -1454,8 +1454,9 @@
4 
 		if (maybe == 0)
4 
 			return ename;
 5 
 			return ename;
5
6
7 
+		if ( (maxfunc!=1) && (try==maybe) ) continue ;
6 
 		for (i = 0; i < maxfunc; i++) {
 8 
 		for (i = 0; i < maxfunc; i++) {
7 
-			if (maybe == (1 << i))
 9 
-			if (maybe == (1 << i))
8 
+			if (maybe & (1 << i))
 10 
+			if (maybe & (1 << i))
(-)files/patch-configure (-11 / +4 lines)
Lines 1-6 Link Here
1 
--- configure.orig	2016-01-31 11:55:44 UTC
 1 
--- configure.orig	2016-01-31 11:55:44 UTC
2 
+++ configure
 2 
+++ configure	2017-11-28 18:37:14.184568000 +0900
3 
@@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then
 3 
@@ -1805,10 +1805,8 @@
4 
 		case "$host_os" in
 4 
 		case "$host_os" in
5 
 		bsdi2.1)
 5 
 		bsdi2.1)
6 
 			vi_cannapath="/usr/contrib/canna";;
 6 
 			vi_cannapath="/usr/contrib/canna";;
Lines 13-31 Link Here
13 
 		*)
 13 
 		*)
14 
 			vi_cannapath="/usr/local/canna";;
 14 
 			vi_cannapath="/usr/local/canna";;
15 
 		esac
 15 
 		esac
16 
@@ -2155,13 +2153,13 @@ fi
 16 
@@ -2161,7 +2159,7 @@
17 
 #	[  --disable-curses        DON'T use the nvi-provided curses routines.],
18 
 #	[vi_cv_curses="other curses"], [vi_cv_curses="bundled curses"])
19 
 #AC_MSG_RESULT($vi_cv_curses)
20 
-vi_cv_curses="bundled curses"
21 
+vi_cv_curses="other curses"
22 
 case "$vi_cv_curses" in
23 
 "bundled curses")
24 
 	CPPFLAGS="-I\$(srcdir)/curses $CPPFLAGS"
 17 
 	CPPFLAGS="-I\$(srcdir)/curses $CPPFLAGS"
25 
 	cobjs="\$(COBJS)";;
 18 
 	cobjs="\$(COBJS)";;
26 
 "other curses")
 19 
 "other curses")
27 
-	LIBS="-lcurses $LIBS";;
 20 
-	LIBS="-lcurses $LIBS";;
28 
+	LIBS="-lncurses $LIBS";;
 21 
+	LIBS="-lncursesw $LIBS";;
29 
 esac
 22 
 esac
30
23
31 
 echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6
 24 
 echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6

Return to bug 220013