Attachment 188352 Details for Bug 220013 – patch to correct detection of fileencoding and to avoid disappeared some symbols

[patch] patch to correct detection of fileencoding and to avoid disappeared some symbols

patch (text/plain), 1.81 KB, created by Satoshi TOMIOKA on 2017-11-28 13:23:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoshi TOMIOKA

Created: 2017-11-28 13:23:14 UTC

Size: 1.81 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 220013: 183498 | 183510 | 188075 | 188352