Pull two post 3.3.1 fixes from mlterm upstream:

https://bitbucket.org/arakiken/mlterm/commits/ba3a5a22ae82b7c227cfd9f952881a281c53f82a
 * ml_vt100_parser.c: U+200c-200f and U+202a-202e aren't converted
   even if -n option is specified.

https://bitbucket.org/arakiken/mlterm/commits/4ccecc4cbc90ed69054f0e94179bdccb6fda5868
 * x_screen.c: The limitation of the column width and the line height (< 32)
   is removed.

Bump PKGREVISION.

4 files changed, 66 insertions, 2 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 354c3a04c27..6611b87a36a 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2013/11/30 22:28:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.97 2013/12/14 16:30:17 tsutsui Exp $
 
 DISTNAME=	mlterm-3.3.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index a310cb36281..af9a2fe240f 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.37 2013/11/30 22:28:41 tsutsui Exp $
+$NetBSD: distinfo,v 1.38 2013/12/14 16:30:17 tsutsui Exp $
 
 SHA1 (mlterm-3.3.1.tar.gz) = 1009e5ff4ad1bfac90dd3f01d0144d76c2f12d1f
 RMD160 (mlterm-3.3.1.tar.gz) = c53d77754e1db1612e49f4cd272f1fcf8f2f7ca5
 Size (mlterm-3.3.1.tar.gz) = 3566097 bytes
 SHA1 (patch-configure) = 066d0e35d63f30ad9a892937af3a372fbea56936
 SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318
+SHA1 (patch-mlterm_ml__vt100__parser.c) = c440720ab84d192dfc75369f477229e2c7774f50
+SHA1 (patch-xwindow_x__screen.c) = 13599925ab6824b3700d84197765a7c611ca211f
diff --git a/x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c b/x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c
new file mode 100644
index 00000000000..6d04d8e5a40
--- /dev/null
+++ b/x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-mlterm_ml__vt100__parser.c,v 1.1 2013/12/14 16:30:18 tsutsui Exp $
+
+Pull fix from upstream ba3a5a22ae82b7c227cfd9f952881a281c53f82a:
+ * ml_vt100_parser.c: U+200c-200f and U+202a-202e aren't converted
+  even if -n option is specified.
+
+--- mlterm/ml_vt100_parser.c.orig	2013-11-22 15:31:23.000000000 +0000
++++ mlterm/ml_vt100_parser.c
+@@ -246,7 +246,7 @@ is_noconv_unicode(
+ 	u_char *  ch
+ 	)
+ {
+-	if( unicode_noconv_areas)
++	if( unicode_noconv_areas || ch[2] == 0x20)
+ 	{
+ 		u_int  count ;
+ 		u_int32_t  code ;
+@@ -261,6 +261,16 @@ is_noconv_unicode(
+ 				return  1 ;
+ 			}
+ 		}
++
++		/*
++		 * Don't convert these characters in order not to show them.
++		 * see ml_char_cols().
++		 */
++		if( ( 0x200c <= code && code <= 0x200f) ||
++		    ( 0x202a <= code && code <= 0x202e))
++		{
++			return  1 ;
++		}
+ 	}
+ 
+ 	return  0 ;
diff --git a/x11/mlterm/patches/patch-xwindow_x__screen.c b/x11/mlterm/patches/patch-xwindow_x__screen.c
new file mode 100644
index 00000000000..2801b4f9601
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_x__screen.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-xwindow_x__screen.c,v 1.3 2013/12/14 16:30:18 tsutsui Exp $
+
+Pull fix from upstream 4ccecc4cbc90ed69054f0e94179bdccb6fda5868:
+ * x_screen.c: The limitation of the column width and the line height (< 32)
+   is removed.
+
+--- xwindow/x_screen.c.orig	2013-11-22 15:31:39.000000000 +0000
++++ xwindow/x_screen.c
+@@ -7244,15 +7244,13 @@ xterm_get_picture_data(
+ 
+ 	screen = p ;
+ 
+-	if( ml_term_get_vertical_mode( screen->term) ||
+-	    ( col_width = x_col_width(screen)) >= 32 ||
+-	    ( line_height = x_line_height(screen)) >= 32)
++	if( ml_term_get_vertical_mode( screen->term))
+ 	{
+ 		return  NULL ;
+ 	}
+ 
+-	width = (*num_of_cols) * col_width ;
+-	height = (*num_of_rows) * line_height ;
++	width = (*num_of_cols) * (col_width = x_col_width(screen)) ;
++	height = (*num_of_rows) * (line_height = x_line_height(screen)) ;
+ 
+ 	if( ( idx = x_load_inline_picture( screen->window.disp , file_path ,
+ 			&width , &height , col_width , line_height , screen->term)) != -1)