<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ef8822cab56ceda4687b6f9a7581aaff86c383d0">https://github.com/macports/macports-ports/commit/ef8822cab56ceda4687b6f9a7581aaff86c383d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ef8822cab56 w3m, w3m-devel: update to latest versions
</span>ef8822cab56 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ef8822cab56ceda4687b6f9a7581aaff86c383d0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Jul 25 10:58:37 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> w3m, w3m-devel: update to latest versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * w3m to debian version 0.5.3-38
</span><span style='display:block; white-space:pre;color:#404040;'> * w3m-devel to git master as of 20200823
</span>---
www/w3m/Portfile | 32 +-
www/w3m/files/debian/010_upstream.patch | 16 +-
www/w3m/files/debian/020_debian.patch | 1013 ++++++++++++++++++++-----------
3 files changed, 675 insertions(+), 386 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/Portfile b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbbe99c072d..e938fecea2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,10 @@
</span> PortSystem 1.0
name w3m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sf_version 0.5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set debian_revision 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${sf_version}-${debian_revision}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories www
license MIT
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,30 +24,31 @@ depends_lib port:boehmgc port:zlib path:lib/libssl.dylib:openssl port:nc
</span> port:gettext port:libiconv
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites sourceforge:project/w3m/w3m/w3m-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites sourceforge:project/w3m/w3m/w3m-${sf_version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 1b845a983a50b8dec0169ac48479eacc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 444b6c8cf7094ee95f8e9de96b37f814b9d83237 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${sf_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6a0153bc53f7c107c700404262ce1b4d02e6dd91 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2202328
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # LC_ALL=C sed -i '' 's|^+++ w3m/|+++ |' 010_upstream.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LC_ALL=C sed -i '' 's|^+++ b/|+++ |' 020_debian.patch
</span> patchfiles debian/010_upstream.patch \
debian/020_debian.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conflicts w3m-devel
}
subport w3m-devel {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup tats w3m 169789b1480710712d587d5859fab9d93eb952a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup tats w3m b65f7b243dc156f0b6b7dfa0dae4152942e33bea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200823
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 76853eefec217a90c8876599f33e3d2fb74bf3b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1bb513056fba2b581ce0e45e6e4d6f15eae1dd0b0af78dce9ecb49a1c73b87e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2182420
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4f9e4ccbe1238fde5e34a94e86f13badd397242f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1c1001d3189ed38305a7cb70b7588560e921444dac0b738ae5715fc2b4f6008e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2195656
</span>
conflicts w3m
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +84,5 @@ variant inline_image_imlib2 description {View inline images with imlib2} {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version "${version}-37"
</span> livecheck.url https://packages.debian.org/unstable/w3m
livecheck.regex ${name}_(\\d+(?:\\.\\d+)*-\\d+)(?:\\.\\d+)?.debian.tar.xz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/files/debian/010_upstream.patch b/www/w3m/files/debian/010_upstream.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 32e6120d6a8..64e089de9d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/files/debian/010_upstream.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/files/debian/010_upstream.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ Origin: upstream, http://w3m.cvs.sourceforge.net/viewvc/w3m/w3m/
</span>
diff -urN w3m-0.5.3/ChangeLog w3m/ChangeLog
--- w3m-0.5.3/ChangeLog 2011-01-15 16:52:48.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ChangeLog 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/ChangeLog 2012-05-22 22:11:44.000000000 +0900
</span> @@ -1,12 +1,31 @@
+2012-05-22 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ diff -urN w3m-0.5.3/ChangeLog w3m/ChangeLog
</span> +$Id: ChangeLog,v 1.1055 2012/05/22 10:20:45 inu Exp $
diff -urN w3m-0.5.3/Makefile.in w3m/Makefile.in
--- w3m-0.5.3/Makefile.in 2011-01-04 18:22:18.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/Makefile.in 2012-05-22 22:11:44.000000000 +0900
</span> @@ -288,7 +288,7 @@
clean: sweep
-$(RM) -f *.o *.a $(TARGETS) mktable$(EXT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ diff -urN w3m-0.5.3/Makefile.in w3m/Makefile.in
</span> (cd $$dir && $(MAKE) clean RM="$(RM)"); \
diff -urN w3m-0.5.3/doc/STORY.html w3m/doc/STORY.html
--- w3m-0.5.3/doc/STORY.html 2001-11-21 13:29:14.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/STORY.html 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/doc/STORY.html 2012-05-22 22:11:44.000000000 +0900
</span> @@ -182,6 +182,10 @@
I could distribute w3m without this library because one can
get the library separately, but I decided to contain it in the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ diff -urN w3m-0.5.3/doc/STORY.html w3m/doc/STORY.html
</span> Boehm GC is a garbage collector for C and C++. I began to use this
diff -urN w3m-0.5.3/doc/w3m.1 w3m/doc/w3m.1
--- w3m-0.5.3/doc/w3m.1 2011-01-15 15:37:24.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/w3m.1 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/doc/w3m.1 2012-05-22 22:11:44.000000000 +0900
</span> @@ -245,8 +245,6 @@
.I
w3m
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,7 @@ diff -urN w3m-0.5.3/doc/w3m.1 w3m/doc/w3m.1
</span> Akinori ITO <aito@fw.ipsj.or.jp>
diff -urN w3m-0.5.3/doc-jp/STORY.html w3m/doc-jp/STORY.html
--- w3m-0.5.3/doc-jp/STORY.html 2003-05-14 02:17:54.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/STORY.html 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/doc-jp/STORY.html 2012-05-22 22:11:44.000000000 +0900
</span> @@ -158,6 +158,9 @@
<a href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">Boehm GC</a>
�Ȥ����饤�֥������Ѥ��Ƥ��롥����ϻ䤬����ΤǤϤʤ�����
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ diff -urN w3m-0.5.3/doc-jp/STORY.html w3m/doc-jp/STORY.html
</span> Boehm GC�ϡ�C����Ȥ��륬�١������쥯������table ���������������ˤ����
diff -urN w3m-0.5.3/file.c w3m/file.c
--- w3m-0.5.3/file.c 2011-01-04 18:22:21.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/file.c 2012-05-22 22:11:44.000000000 +0900
</span> @@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.265 2010/12/15 10:50:24 htrb Exp $ */
+/* $Id: file.c,v 1.266 2012/05/22 09:45:56 inu Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,7 @@ diff -urN w3m-0.5.3/file.c w3m/file.c
</span> q += 7;
diff -urN w3m-0.5.3/html.c w3m/html.c
--- w3m-0.5.3/html.c 2011-01-04 18:22:21.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ html.c 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/html.c 2012-05-22 22:11:44.000000000 +0900
</span> @@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.32 2010/08/14 01:29:40 htrb Exp $ */
+/* $Id: html.c,v 1.33 2012/05/22 09:45:56 inu Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@ diff -urN w3m-0.5.3/html.c w3m/html.c
</span> unsigned char ALST_FRAMESET[] = { ATTR_COLS, ATTR_ROWS, ATTR_CORE };
diff -urN w3m-0.5.3/version.c.in w3m/version.c.in
--- w3m-0.5.3/version.c.in 2011-01-15 16:52:48.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ version.c.in 2012-05-22 22:11:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3m/version.c.in 2012-05-22 22:11:44.000000000 +0900
</span> @@ -1,5 +1,5 @@
-/* $Id: version.c.in,v 1.48 2011/01/15 07:52:48 inu Exp $ */
-#define CURRENT_VERSION "w3m/0.5.3"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/files/debian/020_debian.patch b/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bcb8c2d7607..c9126b3b35c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ Origin: https://salsa.debian.org/debian/w3m/commits/master
</span> diff --git a/Bonus/goodict.cgi b/Bonus/goodict.cgi
index 8f443c1..5fb6581 100755
--- a/Bonus/goodict.cgi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Bonus/goodict.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Bonus/goodict.cgi
</span> @@ -1,14 +1,20 @@
#!/usr/bin/perl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,10 +60,60 @@ index 8f443c1..5fb6581 100755
</span> $input = "w3m-control: GOTO_LINK";
}
diff --git a/ChangeLog b/ChangeLog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 88358ef..7367d67 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 88358ef..2ea89c6 100644
</span> --- a/ChangeLog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ChangeLog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,1693 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,1743 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2020-05-02 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * NEWS: Update NEWS for 0.5.3+git20200502.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2020-03-27 Roland Illig <rillig@NetBSD.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * main.c: Fix -Wchar-subscripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/www/w3m/patches/patch-main.c?rev=1.1&content-type=text/plain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug: https://sourceforge.net/p/w3m/patches/76/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2020-03-16 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc-de/MANUAL.html, doc/MANUAL.html: Update documents for GOTO_HOME.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc-de/README.func, doc-jp/README.func, doc-jp/keymap.default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.func, doc/keymap.default, scripts/w3mhelp.cgi.in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Add GOTO_HOME to the help page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2020-03-11 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc-jp/README.SSL, po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * po/zh_TW.po, rc.c: Update documents for ssl_forbid_method.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * url.c: Extend ssl_forbid_method for TLSv1.2 and TLSv1.3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2020-01-13 We're Yet <58348703+butwerenotthereyet@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * keybind.c, main.c, proto.h: Add command to go home.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/124
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-11-10 Kyle J. McKay <mackyle@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * entity.tab, indep.c, indep.h: Support ' entity.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-07-02 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc-jp/README.siteconf: Update doc-jp for user_agent in siteconf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-07-01 Azure <azure@fox.blue>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.siteconf, fm.h, rc.c, url.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Allow setting User Agent in Siteconf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-04-21 Laurent Arnoud <laurent@spkdev.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * fm.h, main.c, url.c: Allow to override User-Agent with -header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +2019-01-05 Tatsuya Kinoshita <tats@debian.org>
+
+ * NEWS: Update NEWS.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1760,7 +1810,7 @@ index 88358ef..7367d67 100644
</span> diff --git a/Makefile.in b/Makefile.in
index 7d692f9..453072d 100644
--- a/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in
</span> @@ -111,6 +111,7 @@ IMGDISPLAY=w3mimgdisplay$(EXT)
MAN1_TARGET=$(PACKAGE).1
MAN1=$(top_srcdir)/doc/w3m.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1809,10 +1859,21 @@ index 7d692f9..453072d 100644
</span> do \
(cd $$dir && $(MAKE) $(MAKE_ARGS) uninstall); \
diff --git a/NEWS b/NEWS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66e309d..dac1f5c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66e309d..6cc597f 100644
</span> --- a/NEWS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ NEWS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/NEWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,100 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Debian's w3m 0.5.3+git20200502
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* bug fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - support ' entity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - prevent multiple User-Agent with -header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - fix -Wchar-subscripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* new features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - support setting user_agent in siteconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - new command GOTO_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - extend ssl_forbid_method for TLSv1.2 and TLSv1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +Debian's w3m 0.5.3+git20190105
+
+* bug fixes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1905,7 +1966,7 @@ index 66e309d..dac1f5c 100644
</span> diff --git a/README b/README
index 8778d80..765c996 100644
--- a/README
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/README
</span> @@ -1,3 +1,9 @@
+w3m: WWW wo Miru Tool
+=====================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1919,7 +1980,7 @@ index 8778d80..765c996 100644
</span> diff --git a/Str.c b/Str.c
index e5a0982..61fe3ca 100644
--- a/Str.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Str.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Str.c
</span> @@ -48,6 +48,8 @@ Str
Strnew_size(int n)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2054,7 +2115,7 @@ index e5a0982..61fe3ca 100644
</span> diff --git a/Str.h b/Str.h
index f345c74..248815d 100644
--- a/Str.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Str.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Str.h
</span> @@ -30,22 +30,22 @@ typedef struct _Str {
Str Strnew(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2089,7 +2150,7 @@ index f345c74..248815d 100644
</span> diff --git a/acinclude.m4 b/acinclude.m4
index e4ccc3d..ed1035d 100644
--- a/acinclude.m4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/acinclude.m4
</span> @@ -6,7 +6,8 @@ dnl w3m autoconf macros
AC_DEFUN([AC_W3M_VERSION],
[AC_SUBST(CURRENT_VERSION)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2207,7 +2268,7 @@ diff --git a/alloc.h b/alloc.h
</span> new file mode 100644
index 0000000..fa0d391
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alloc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/alloc.h
</span> @@ -0,0 +1,39 @@
+/*
+ * by Scarlett. public domain.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2251,7 +2312,7 @@ index 0000000..fa0d391
</span> diff --git a/anchor.c b/anchor.c
index 27bbd56..b6d121c 100644
--- a/anchor.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ anchor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/anchor.c
</span> @@ -11,7 +11,7 @@ putAnchor(AnchorList *al, char *url, char *target, Anchor **anchor_return,
{
int n, i, j;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2388,7 +2449,7 @@ index 27bbd56..b6d121c 100644
</span> diff --git a/buffer.c b/buffer.c
index 5afc26a..e70cffe 100644
--- a/buffer.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ buffer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/buffer.c
</span> @@ -47,6 +47,8 @@ newBuffer(int width)
#ifdef USE_M17N
n->auto_detect = WcOption.auto_detect;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2422,7 +2483,7 @@ index 5afc26a..e70cffe 100644
</span> diff --git a/config.guess b/config.guess
index 51fab47..f50dcdb 100755
--- a/config.guess
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.guess
</span> @@ -1,13 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4631,7 +4692,7 @@ index 51fab47..f50dcdb 100755
</span> diff --git a/config.h.dist b/config.h.dist
index 844a555..4d9c119 100644
--- a/config.h.dist
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.h.dist
</span> @@ -9,10 +9,10 @@
/* User Configuration */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4656,7 +4717,7 @@ index 844a555..4d9c119 100644
</span> diff --git a/config.h.in b/config.h.in
index 2f41eed..6ab3008 100644
--- a/config.h.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.h.in
</span> @@ -25,6 +25,7 @@
#define PASSWD_FILE RC_DIR "/passwd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4696,7 +4757,7 @@ index 2f41eed..6ab3008 100644
</span> diff --git a/config.sub b/config.sub
index ba33103..1d8e98b 100755
--- a/config.sub
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.sub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.sub
</span> @@ -1,42 +1,40 @@
#! /bin/sh
# Configuration validation subroutine script.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6070,7 +6131,7 @@ index ba33103..1d8e98b 100755
</span> diff --git a/configure b/configure
index 4c1bc06..8699b43 100755
--- a/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure
</span> @@ -1486,11 +1486,11 @@ Optional Packages:
--with-migemo=MIGEMO_COMMAND migemo command
--with-editor=EDITOR default editor (/usr/bin/vi)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6222,7 +6283,7 @@ index 4c1bc06..8699b43 100755
</span> diff --git a/configure.ac b/configure.ac
index 7308fc6..ebb3282 100644
--- a/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span> @@ -150,7 +150,7 @@ dnl AC_FUNC_MEMCMP
dnl AC_FUNC_MMAP
dnl AC_FUNC_SETVBUF_REVERSED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6254,7 +6315,7 @@ index 7308fc6..ebb3282 100644
</span> diff --git a/cookie.c b/cookie.c
index 8020f6d..705e277 100644
--- a/cookie.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cookie.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cookie.c
</span> @@ -22,10 +22,10 @@ static int is_saved = 1;
#define contain_no_dots(p, ep) (total_dot_number((p),(ep),1)==0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6383,7 +6444,7 @@ index 8020f6d..705e277 100644
</span> diff --git a/display.c b/display.c
index e00eb0c..e62d07f 100644
--- a/display.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ display.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/display.c
</span> @@ -257,7 +257,7 @@ make_lastline_link(Buffer *buf, char *title, char *url)
parseURL2(url, &pu, baseURL(buf));
u = parsedURL2Str(&pu);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6493,7 +6554,7 @@ diff --git a/doc-de/FAQ.html b/doc-de/FAQ.html
</span> new file mode 100644
index 0000000..d88ba64
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-de/FAQ.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-de/FAQ.html
</span> @@ -0,0 +1,691 @@
+
+<html>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7188,10 +7249,10 @@ index 0000000..d88ba64
</span> +</html>
diff --git a/doc-de/MANUAL.html b/doc-de/MANUAL.html
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..f922314
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..e12d3b3
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-de/MANUAL.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,2340 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-de/MANUAL.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,2353 @@
</span> +
+<html>
+ <head>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8564,6 +8625,19 @@ index 0000000..f922314
</span> + </tr>
+ <tr>
+ <td>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ GOTO_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ C-_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Zurück zur Startseite (die Variablen HTTP_HOME oder WWW_HOME spezifiziert wurden)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span> + SELECT_MENU
+ </td>
+ <td>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9534,10 +9608,10 @@ index 0000000..f922314
</span> +</html>
diff --git a/doc-de/README.func b/doc-de/README.func
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..72d7d45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..036ae9d
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-de/README.func
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,146 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-de/README.func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,147 @@
</span> +ABORT Sofort beenden
+ACCESSKEY Öffne Zugangstasten-Menü
+ADD_BOOKMARK Lege für aktuelle Seite Lesezeichen an
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9570,6 +9644,7 @@ index 0000000..72d7d45
</span> +EXTERN_LINK Verwende externen Browser zur Anzeige des Linkziels
+FRAME Wechsle zwischen Kennung und Umsetzung von HTML-Frames
+GOTO Öffne angegebenes Dokument in neuem Puffer
<span style='display:block; white-space:pre;background:#e0ffe0;'>++GOTO_HOME Zurück zur Startseite (die Variablen HTTP_HOME oder WWW_HOME spezifiziert wurden)
</span> +GOTO_LINE Gehe zur angebenen Zeile
+GOTO_LINK Folge dem aktuellen Hyperlink in neuem Puffer
+GOTO_RELATIVE Gehe zu relativer Adresse
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9688,7 +9763,7 @@ diff --git a/doc-de/w3m.1 b/doc-de/w3m.1
</span> new file mode 100644
index 0000000..7deb203
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-de/w3m.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-de/w3m.1
</span> @@ -0,0 +1,334 @@
+.nr N -1
+.nr D 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10027,7 +10102,7 @@ index 0000000..7deb203
</span> diff --git a/doc-jp/FAQ.html b/doc-jp/FAQ.html
index e16a986..86ef05a 100644
--- a/doc-jp/FAQ.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/FAQ.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/FAQ.html
</span> @@ -176,7 +176,7 @@ w3m
��¸���ޤ�����������¸������� ESC I �Ǥ���
<p>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10040,7 +10115,7 @@ index e16a986..86ef05a 100644
</span> diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html
index 41d70f1..66fdc6e 100644
--- a/doc-jp/MANUAL.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/MANUAL.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/MANUAL.html
</span> @@ -51,15 +51,9 @@ w3m
<dt>-l �Կ�
<dd>ɸ�����Ϥ����Ƥ�ɽ������Ȥ�����¸��������Կ����ꤹ
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10105,7 +10180,7 @@ index 41d70f1..66fdc6e 100644
</span> diff --git a/doc-jp/README b/doc-jp/README
index 074766f..e5e59b1 100644
--- a/doc-jp/README
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/README
</span> @@ -122,7 +122,6 @@ w3m
��������±�
satodai@w3m.jp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10117,16 +10192,17 @@ index 074766f..e5e59b1 100644
</span> http://w3m.sourceforge.net/
+ https://sourceforge.net/projects/w3m/
diff --git a/doc-jp/README.SSL b/doc-jp/README.SSL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4aedfde..ac3f4a3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4aedfde..ae22001 100644
</span> --- a/doc-jp/README.SSL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/README.SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,10 +24,10 @@ SSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/README.SSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,10 +24,11 @@ SSL
</span> �� SSL �˴ؤ��ưʲ������꤬��ǽ�ˤʤäƤޤ�:
ssl_forbid_method
- �Ȥ�ʤ�SSL��åɤΥꥹ��(2: SSLv2, 3: SSLv3, t: TLSv1)
- (�ǥե���Ȥ�<NULL>).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ �Ȥ�ʤ�SSL��åɤΥꥹ��(2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ �Ȥ�ʤ�SSL��åɤΥꥹ��(2: SSLv2, 3: SSLv3, t: TLSv1.0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)
</span> + (�ǥե���Ȥ�2, 3).
ssl_verify_server ON/OFF
- SSL�Υ�����ǧ�ڤ�Ԥ�(�ǥե���Ȥ�OFF).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10134,7 +10210,7 @@ index 4aedfde..ac3f4a3 100644
</span> ssl_cert_file �ե�����̾
SSL�Υ��饤�������PEM����������ե�����(�ǥե���Ȥ�<NULL>).
ssl_key_file �ե�����̾
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +85,9 @@ SSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,6 +86,9 @@ SSL
</span> #
# certdata2pem.rb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10145,9 +10221,9 @@ index 4aedfde..ac3f4a3 100644
</span> next if line =~ /^#/
next if line =~ /^\s*$/
diff --git a/doc-jp/README.func b/doc-jp/README.func
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 542aaa9..8a5f821 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 542aaa9..750d3d7 100644
</span> --- a/doc-jp/README.func
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/README.func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/README.func
</span> @@ -1,7 +1,7 @@
ABORT ��ǧ������w3m��λ���ޤ�
ACCESSKEY Accesskey ��˥塼��Ω���夲�ޤ�
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10157,7 +10233,14 @@ index 542aaa9..8a5f821 100644
</span> BACK ������ΥХåե���ɽ�����ޤ�
BEGIN ʸ��Τ����Ф��ιԤ˰�ư���ޤ�
BOOKMARK �֥å��ޡ������ɤ߹��ߤޤ�
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,6 @@ GOTO_RELATIVE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,13 +30,13 @@ EXTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN_LINK ���ߤΥ�������֥饦����Ȥä�ɽ�����ޤ�
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRAME <FRAME>�����λؤ�ʸ���1�Ĥ�ʸ����Ѵ�����ɽ�����ޤ�
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOTO URL����ꤷ�Ƴ����ޤ�
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GOTO_HOME �ۡ���ڡ��������ޤ�(�Ķ��ѿ�HTTP_HOME�ޤ���WWW_HOME�ǻ���)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOTO_LINE ���̲��ǹ��ֹ�����Ϥ��������ǻ��ꤷ���Ԥ˰�ư���ޤ�
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOTO_LINK ����ؤ����ʸ����ɤߤ��ߤޤ�
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOTO_RELATIVE ����URL����ꤷ�Ƴ����ޤ�
</span> HELP �إ�ץե������ɽ�����ޤ�
HISTORY URL�����ɽ�����ޤ�
INFO ���ߤ�ʸ��˴ؤ�������ɽ�����ޤ�
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10165,7 +10248,7 @@ index 542aaa9..8a5f821 100644
</span> INTERRUPT ʸ����ɤ߹��ߤ����Ǥ��ޤ�
ISEARCH �ե�����������ˤफ�äƥ����륵�������ޤ�
ISEARCH_BACK �ե��������Ƭ�ˤफ�äƥ����륵�������ޤ�
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,6 +71,7 @@ MSGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,6 +72,7 @@ MSGS
</span> NEW_TAB ���������֤��ޤ�
NEXT ���ΥХåե���ɽ�����ޤ�
NEXT_DOWN ��������β�¦�ˤ����˰�ư���ޤ�
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10173,7 +10256,7 @@ index 542aaa9..8a5f821 100644
</span> NEXT_LEFT ��������κ�¦�ˤ����˰�ư���ޤ�
NEXT_LEFT_UP ��������κ�¦(̵��������ι���)�ˤ����˰�ư���ޤ�
NEXT_LINK ���Υ�˰�ư���ޤ�
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,6 +92,7 @@ PEEK_LINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,6 +93,7 @@ PEEK_LINK
</span> PIPE_BUF �Хåե������Ƥ�ѥ��פ��Ϥ��ޤ�
PIPE_SHELL ���ޥ�ɤ�¹Ԥ�����̤��ɤߤ��ߤʤ���ɽ�����ޤ�
PREV ���ΥХåե���ɽ�����ޤ�
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10183,10 +10266,10 @@ index 542aaa9..8a5f821 100644
</span> PREV_PAGE ���Υڡ�����ɽ�����ޤ�
diff --git a/doc-jp/README.siteconf b/doc-jp/README.siteconf
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..90066f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..c7617b3
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/README.siteconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/README.siteconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,67 @@
</span> +siteconf: �������̥������ޥ���
+
+siteconf �ϡ� URL �Υѥ�����ȡ������ɳ�դ���줿���꤫������ޤ���
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10203,6 +10286,7 @@ index 0000000..90066f7
</span> +url_charset <charset>
+no_referer_from on|off
+no_referer_to on|off
<span style='display:block; white-space:pre;background:#e0ffe0;'>++user_agent "string"
</span> +
+�������˽줿��Τ�ͥ�褵��ޤ���
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10230,6 +10314,12 @@ index 0000000..90066f7
</span> +Ʊ���� "decode_url" ���ץ�����ˤ���ȡ� Wikipedia �ؤ�
+��� UTF-8 �Ȥ��ƥǥ����ɤ���ɽ�����ޤ���
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++url m@^https?://(.*\.)google\.com/@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++user_agent "Lynx/2.8.8dev.3 libwww-FM/2.14 SSL-MM/1.4.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Google �� Lynx �Ǥ���ȹ𤲤ޤ���(����ˤ��ƥ����ȥ֥饦�������ڡ�����
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++�֤�ޤ�)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +===== ����ɽ���ˤĤ��� =====
+
+��������ɽ���Ϥ������Ʊ����̣��ɽ���ޤ���
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10250,7 +10340,7 @@ index 0000000..90066f7
</span> diff --git a/doc-jp/README.tab b/doc-jp/README.tab
index 61f7c58..99a1220 100644
--- a/doc-jp/README.tab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/README.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/README.tab
</span> @@ -38,6 +38,6 @@ w3m $B$r%?%V%V%i%&%62=(B
open_tab_blank $B!D(B target $B$,(B _blank $B$+(B _new $B$N>l9g$O?7$7$$%?%V$G3+$/(B
$B%G%U%)%k%H$O(B OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10259,10 +10349,22 @@ index 61f7c58..99a1220 100644
</span> + $B%G%U%)%k%H$O(B OFF (= Can't go back...)
$B$rDI2C$7$F$$$^$9!#(B
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc-jp/keymap.default b/doc-jp/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ecf14f..174e4ed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/doc-jp/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Left : LEFT, ^[[D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-@ MARK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++keymap C-_ GOTO_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-a LINE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-b MOVE_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-e LINE_END
</span> diff --git a/doc-jp/keymap.lynx b/doc-jp/keymap.lynx
index 869c716..e4085c8 100644
--- a/doc-jp/keymap.lynx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/keymap.lynx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/keymap.lynx
</span> @@ -46,7 +46,7 @@ keymap - PREV_PAGE
keymap . RIGHT
keymap / SEARCH
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10275,7 +10377,7 @@ index 869c716..e4085c8 100644
</span> diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1
index 89aacb6..a54e078 100644
--- a/doc-jp/w3m.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc-jp/w3m.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc-jp/w3m.1
</span> @@ -1,5 +1,5 @@
.\"
-.TH W3M 1 "Jun 6 2000" "UNIX"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10335,7 +10437,7 @@ index 89aacb6..a54e078 100644
</span> diff --git a/doc/FAQ.html b/doc/FAQ.html
index ed2a704..ca82c67 100644
--- a/doc/FAQ.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/FAQ.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/FAQ.html
</span> @@ -1,291 +1,763 @@
-<HTML>
-<HEAD>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11387,7 +11489,7 @@ index ed2a704..ca82c67 100644
</span> diff --git a/doc/HISTORY b/doc/HISTORY
index b8f5b94..7f7ae2b 100644
--- a/doc/HISTORY
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/HISTORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/HISTORY
</span> @@ -588,7 +588,7 @@ From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
* space characters in a buffer are mapped into 0x80-0x9f.
* unprintable characters (0x80-0xa0) are displayed as \xxx.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11435,10 +11537,10 @@ index b8f5b94..7f7ae2b 100644
</span>
From: "OMAE, jun" <jun-o@osb.att.ne.jp>
diff --git a/doc/MANUAL.html b/doc/MANUAL.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index aff0189..f0710a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aff0189..91a3485 100644
</span> --- a/doc/MANUAL.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/MANUAL.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,535 +1,2424 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/MANUAL.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,535 +1,2437 @@
</span> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13301,6 +13403,19 @@ index aff0189..f0710a7 100644
</span> + </tr>
+ <tr>
+ <td>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ GOTO_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ C-_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Return to the homepage (specified HTTP_HOME or WWW_HOME variable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </td>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <td>
</span> + SELECT_MENU
+ </td>
+ <td>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14366,7 +14481,7 @@ index aff0189..f0710a7 100644
</span> diff --git a/doc/README b/doc/README
index 324ea3e..60d6d19 100644
--- a/doc/README
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README
</span> @@ -115,7 +115,6 @@ Current Maintainer
Tohoku University Hospital
satodai@w3m.jp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14380,7 +14495,7 @@ index 324ea3e..60d6d19 100644
</span> diff --git a/doc/README.cookie b/doc/README.cookie
index 56cca50..71523e0 100644
--- a/doc/README.cookie
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.cookie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.cookie
</span> @@ -9,21 +9,21 @@ cookie support of w3m
http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-12.txt)
cookie.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14423,7 +14538,7 @@ index 56cca50..71523e0 100644
</span> diff --git a/doc/README.dict b/doc/README.dict
index bd82cdb..88f4b1a 100644
--- a/doc/README.dict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.dict
</span> @@ -2,14 +2,14 @@ Dictionary look-up hack for w3m
1. INTRODUCTION
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14453,10 +14568,10 @@ index bd82cdb..88f4b1a 100644
</span>
Then find or install a CGI program which takes a word as a query
diff --git a/doc/README.func b/doc/README.func
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0b2c034..a3ef3ac 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b2c034..0430855 100644
</span> --- a/doc/README.func
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.func
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,145 +1,146 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.func
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,145 +1,147 @@
</span> -ABORT Quit w3m without confirmation
-ACCESSSKEY Popup acceskey menu
-ADD_BOOKMARK Add current page to bookmark
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14524,6 +14639,7 @@ index 0b2c034..a3ef3ac 100644
</span> +EXTERN_LINK Display target using an external browser
+FRAME Toggle rendering HTML frames
+GOTO Open specified document in a new buffer
<span style='display:block; white-space:pre;background:#e0ffe0;'>++GOTO_HOME Return to the homepage (specified HTTP_HOME or WWW_HOME variable)
</span> +GOTO_LINE Go to the specified line
+GOTO_LINK Follow current hyperlink in a new buffer
+GOTO_RELATIVE Go to relative address
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14732,7 +14848,7 @@ index 0b2c034..a3ef3ac 100644
</span> diff --git a/doc/README.img b/doc/README.img
index 0c10114..af6d9db 100644
--- a/doc/README.img
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.img
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.img
</span> @@ -11,8 +11,8 @@ Introduction
Support
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14803,7 +14919,7 @@ index 0c10114..af6d9db 100644
</span> diff --git a/doc/README.m17n b/doc/README.m17n
index c064d76..da5408b 100644
--- a/doc/README.m17n
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.m17n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.m17n
</span> @@ -49,7 +49,7 @@ Supported encoding schemes (character set)
* Thai
TIS-620 (ISO-8859-11), CP874
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14816,7 +14932,7 @@ index c064d76..da5408b 100644
</span> diff --git a/doc/README.pre_form b/doc/README.pre_form
index 972ef90..dad62f8 100644
--- a/doc/README.pre_form
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.pre_form
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.pre_form
</span> @@ -1,12 +1,12 @@
-pre_form: Feature to configure form parameters when opening specific site.
+pre_form: Feature to pre-fill form parameters when opening a specific site.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14866,10 +14982,10 @@ index 972ef90..dad62f8 100644
</span>
diff --git a/doc/README.siteconf b/doc/README.siteconf
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..39b1028
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..5eb2554
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.siteconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.siteconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,67 @@
</span> +The siteconf: Site-specific preferences
+
+The siteconf consists of URL patterns and preferences associated to them.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14885,6 +15001,7 @@ index 0000000..39b1028
</span> +url_charset <charset>
+no_referer_from on|off
+no_referer_to on|off
<span style='display:block; white-space:pre;background:#e0ffe0;'>++user_agent "string"
</span> +
+The last match wins.
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14912,6 +15029,12 @@ index 0000000..39b1028
</span> +When combinated with "decode_url" option turned on, links to
+Wikipedia will be human-readable.
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++url m@^https?://(.*\.)google\.com/@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++user_agent "Lynx/2.8.8dev.3 libwww-FM/2.14 SSL-MM/1.4.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Tell Google we're actually Lynx. (So they send us a text-browser friendly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++results page.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +===== Regular expressions notes =====
+
+Following expressions are all equivalent:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14934,7 +15057,7 @@ diff --git a/doc/README.sixel b/doc/README.sixel
</span> new file mode 100644
index 0000000..588afc4
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.sixel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.sixel
</span> @@ -0,0 +1,27 @@
+Sixel support of w3m
+ 2014/11/05
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14966,7 +15089,7 @@ index 0000000..588afc4
</span> diff --git a/doc/README.tab b/doc/README.tab
index 8e98e1c..f237f70 100644
--- a/doc/README.tab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/README.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/README.tab
</span> @@ -39,7 +39,7 @@ Options:
open_tab_blank ... open new tab if target is _blank or _new
default: OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14976,10 +15099,22 @@ index 8e98e1c..f237f70 100644
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc/keymap.default b/doc/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ecf14f..174e4ed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/doc/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/keymap.default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Left : LEFT, ^[[D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-@ MARK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++keymap C-_ GOTO_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-a LINE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-b MOVE_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymap C-e LINE_END
</span> diff --git a/doc/keymap.lynx b/doc/keymap.lynx
index 869c716..e4085c8 100644
--- a/doc/keymap.lynx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/keymap.lynx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/keymap.lynx
</span> @@ -46,7 +46,7 @@ keymap - PREV_PAGE
keymap . RIGHT
keymap / SEARCH
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14992,7 +15127,7 @@ index 869c716..e4085c8 100644
</span> diff --git a/doc/menu.submenu b/doc/menu.submenu
index e55193d..e837f46 100644
--- a/doc/menu.submenu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/menu.submenu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/menu.submenu
</span> @@ -39,6 +39,6 @@ menu Link
end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15004,7 +15139,7 @@ index e55193d..e837f46 100644
</span> diff --git a/doc/w3m.1 b/doc/w3m.1
index 8f071c6..90488f3 100644
--- a/doc/w3m.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/w3m.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/doc/w3m.1
</span> @@ -1,13 +1,10 @@
.nr N -1
.nr D 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15481,7 +15616,7 @@ index 8f071c6..90488f3 100644
</span> diff --git a/entity.c b/entity.c
index fdd8f64..45dc95e 100644
--- a/entity.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ entity.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/entity.c
</span> @@ -44,6 +44,8 @@ conv_entity(unsigned int c)
return " ";
if (c == 0xa0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15491,10 +15626,23 @@ index fdd8f64..45dc95e 100644
</span> if (c < 0x100) { /* Latin1 (ISO 8859-1) */
if (UseAltEntity)
return alt_latin1[c - 0xa0];
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/entity.tab b/entity.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 130ae2d..d481312 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/entity.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/entity.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,8 @@ amp 0x26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AMP 0x26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quot 0x22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QUOT 0x22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++apos 0x27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++APOS 0x27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nbsp 0xA0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NBSP 0xA0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iexcl 0xA1
</span> diff --git a/etc.c b/etc.c
index 8fe1215..37c4f15 100644
--- a/etc.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/etc.c
</span> @@ -498,7 +498,7 @@ calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode)
static char *prevl = NULL;
int i, j;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15521,7 +15669,7 @@ index 8fe1215..37c4f15 100644
</span> diff --git a/file.c b/file.c
index 567d41e..0333e9a 100644
--- a/file.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/file.c
</span> @@ -26,6 +26,8 @@
#define min(a,b) ((a) > (b) ? (b) : (a))
#endif /* not min */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17025,9 +17173,9 @@ index 567d41e..0333e9a 100644
</span> }
ungetc(c, fp);
diff --git a/fm.h b/fm.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8378939..96d3ab3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8378939..4a17ecc 100644
</span> --- a/fm.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/fm.h
</span> @@ -76,6 +76,7 @@ typedef int wc_ces; /* XXX: not used */
#include "textlist.h"
#include "funcname1.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17036,7 +17184,7 @@ index 8378939..96d3ab3 100644
</span>
#ifndef HAVE_BCOPY
void bcopy(const void *, void *, int);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,6 +265,18 @@ extern int REV_LB[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,6 +265,20 @@ extern int REV_LB[];
</span> #define IMG_FLAG_ERROR 2
#define IMG_FLAG_DONT_REMOVE 4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17046,8 +17194,10 @@ index 8378939..96d3ab3 100644
</span> +#define SCONF_URL_CHARSET 2
+#define SCONF_NO_REFERER_FROM 3
+#define SCONF_NO_REFERER_TO 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SCONF_N_FIELD 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SCONF_USER_AGENT 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SCONF_N_FIELD 6
</span> +#define query_SCONF_SUBSTITUTE_URL(pu) ((const char *)querySiteconf(pu, SCONF_SUBSTITUTE_URL))
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#define query_SCONF_USER_AGENT(pu) ((const char *)querySiteconf(pu, SCONF_USER_AGENT))
</span> +#define query_SCONF_URL_CHARSET(pu) ((const wc_ces *)querySiteconf(pu, SCONF_URL_CHARSET))
+#define query_SCONF_NO_REFERER_FROM(pu) ((const int *)querySiteconf(pu, SCONF_NO_REFERER_FROM))
+#define query_SCONF_NO_REFERER_TO(pu) ((const int *)querySiteconf(pu, SCONF_NO_REFERER_TO))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17055,7 +17205,7 @@ index 8378939..96d3ab3 100644
</span> /*
* Macros.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,8 +289,6 @@ extern int REV_LB[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,8 +291,6 @@ extern int REV_LB[];
</span> #define inputFilenameHist(p,d,h) inputLineHist(p,d,IN_FILENAME,h)
#define inputChar(p) inputLine(p,"",IN_CHAR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17064,7 +17214,7 @@ index 8378939..96d3ab3 100644
</span> #ifdef __EMX__
#define HAVE_STRCASECMP
#define strcasecmp stricmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,6 +373,8 @@ typedef struct _imageCache {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -362,6 +375,8 @@ typedef struct _imageCache {
</span> int index;
short width;
short height;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17073,7 +17223,7 @@ index 8378939..96d3ab3 100644
</span> } ImageCache;
typedef struct _image {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,6 +575,13 @@ typedef struct _DownloadList {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,6 +577,13 @@ typedef struct _DownloadList {
</span> #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0)
#define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17087,7 +17237,7 @@ index 8378939..96d3ab3 100644
</span> typedef struct {
int pos;
int len;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -569,6 +589,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -569,6 +591,7 @@ typedef struct {
</span> long flag;
Anchor anchor;
Str img_alt;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17095,7 +17245,7 @@ index 8378939..96d3ab3 100644
</span> char fontstat[FONTSTAT_SIZE];
short nobr_level;
Lineprop prev_ctype;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -591,6 +612,7 @@ struct readbuffer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -591,6 +614,7 @@ struct readbuffer {
</span> short nobr_level;
Anchor anchor;
Str img_alt;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17103,7 +17253,7 @@ index 8378939..96d3ab3 100644
</span> char fontstat[FONTSTAT_SIZE];
char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
int fontstat_sp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -802,7 +824,7 @@ global char PermitSaveToPipe init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -802,7 +826,7 @@ global char PermitSaveToPipe init(FALSE);
</span> global char DecodeCTE init(FALSE);
global char AutoUncompress init(FALSE);
global char PreserveTimestamp init(TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17112,7 +17262,7 @@ index 8378939..96d3ab3 100644
</span> global char MetaRefresh init(FALSE);
global char fmInitialized init(FALSE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -874,6 +896,9 @@ global char *index_file init(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -874,6 +898,9 @@ global char *index_file init(NULL);
</span>
global char *CurrentDir;
global int CurrentPid;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17122,7 +17272,7 @@ index 8378939..96d3ab3 100644
</span> /*
* global Buffer *Currentbuf;
* global Buffer *Firstbuf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -896,6 +921,7 @@ global char *CurrentKeyData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -896,6 +923,7 @@ global char *CurrentKeyData;
</span> global char *CurrentCmdData;
global char *w3m_reqlog;
extern char *w3m_version;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17130,7 +17280,15 @@ index 8378939..96d3ab3 100644
</span>
#define DUMP_BUFFER 0x01
#define DUMP_HEAD 0x02
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -968,10 +994,17 @@ global int MailtoOptions init(MAILTO_OPTIONS_IGNORE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -909,6 +937,7 @@ global int w3m_dump init(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global int w3m_halfload init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global Str header_string init(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global int override_content_type init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++global int override_user_agent init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_COLOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global int useColor init(TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -968,10 +997,17 @@ global int MailtoOptions init(MAILTO_OPTIONS_IGNORE);
</span> global char *ExtBrowser init(DEF_EXT_BROWSER);
global char *ExtBrowser2 init(NULL);
global char *ExtBrowser3 init(NULL);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17148,7 +17306,7 @@ index 8378939..96d3ab3 100644
</span> global char *ftppasswd init(NULL);
global int ftppass_hostnamegen init(TRUE);
global int do_download init(FALSE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -991,7 +1024,7 @@ global char *BookmarkFile init(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -991,7 +1027,7 @@ global char *BookmarkFile init(NULL);
</span> global int UseExternalDirBuffer init(TRUE);
global char *DirBufferCommand init("file:///$LIB/dirlist" CGI_EXTENSION);
#ifdef USE_DICT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17157,7 +17315,7 @@ index 8378939..96d3ab3 100644
</span> global char *DictCommand init("file:///$LIB/w3mdict" CGI_EXTENSION);
#endif /* USE_DICT */
global int ignore_null_img_alt init(TRUE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1004,7 +1037,7 @@ global int FoldLine init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1004,7 +1040,7 @@ global int FoldLine init(FALSE);
</span> #define DEFAULT_URL_EMPTY 0
#define DEFAULT_URL_CURRENT 1
#define DEFAULT_URL_LINK 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17166,7 +17324,7 @@ index 8378939..96d3ab3 100644
</span> global int MarkAllPages init(FALSE);
#ifdef USE_MIGEMO
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1065,16 +1098,18 @@ global char SimplePreserveSpace init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1065,16 +1101,18 @@ global char SimplePreserveSpace init(FALSE);
</span> #define wc_Str_conv(x,charset0,charset1) (x)
#define wc_Str_conv_strict(x,charset0,charset1) (x)
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17186,7 +17344,7 @@ index 8378939..96d3ab3 100644
</span> #define SYMBOL_BASE 0x20
global int no_rc_dir init(FALSE);
global char *rc_dir init(NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1113,9 +1148,9 @@ global MouseAction mouse_action;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1113,9 +1151,9 @@ global MouseAction mouse_action;
</span>
#ifdef USE_COOKIE
global int default_use_cookie init(TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17199,7 +17357,7 @@ index 8378939..96d3ab3 100644
</span> #define ACCEPT_BAD_COOKIE_DISCARD 0
#define ACCEPT_BAD_COOKIE_ACCEPT 1
#define ACCEPT_BAD_COOKIE_ASK 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1135,7 +1170,7 @@ global int view_unseenobject init(TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1135,7 +1173,7 @@ global int view_unseenobject init(TRUE);
</span> #endif
#if defined(USE_SSL) && defined(USE_SSL_VERIFY)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17208,7 +17366,7 @@ index 8378939..96d3ab3 100644
</span> global char *ssl_cert_file init(NULL);
global char *ssl_key_file init(NULL);
global char *ssl_ca_path init(NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1144,15 +1179,17 @@ global int ssl_path_modified init(FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1144,15 +1182,17 @@ global int ssl_path_modified init(FALSE);
</span> #endif /* defined(USE_SSL) &&
* defined(USE_SSL_VERIFY) */
#ifdef USE_SSL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17230,7 +17388,7 @@ index 8378939..96d3ab3 100644
</span> diff --git a/form.c b/form.c
index b7556ca..bc14d39 100644
--- a/form.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ form.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/form.c
</span> @@ -10,8 +10,10 @@
#include "regex.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17420,7 +17578,7 @@ index b7556ca..bc14d39 100644
</span> diff --git a/frame.c b/frame.c
index b431437..c595c40 100644
--- a/frame.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/frame.c
</span> @@ -91,7 +91,8 @@ newFrame(struct parsed_tag *tag, Buffer *buf)
body->baseURL = baseURL(buf);
if (tag) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17466,7 +17624,7 @@ index b431437..c595c40 100644
</span> diff --git a/ftp.c b/ftp.c
index 0002abd..2ca0247 100644
--- a/ftp.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ftp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ftp.c
</span> @@ -123,6 +123,7 @@ static int
ftp_login(FTP ftp)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17506,7 +17664,7 @@ index 0002abd..2ca0247 100644
</span> diff --git a/func.c b/func.c
index f389e00..8b5deac 100644
--- a/func.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ func.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/func.c
</span> @@ -8,6 +8,7 @@
#include "fm.h"
#include "func.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17612,7 +17770,7 @@ index f389e00..8b5deac 100644
</span> diff --git a/history.c b/history.c
index 951ef83..f2a00b4 100644
--- a/history.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ history.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/history.c
</span> @@ -17,7 +17,7 @@ historyBuffer(Hist *hist)
for (item = hist->list->last; item; item = item->prev) {
q = html_quote((char *)item->ptr);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17646,7 +17804,7 @@ index 951ef83..f2a00b4 100644
</span> diff --git a/html.c b/html.c
index bca227e..d9f08e9 100644
--- a/html.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ html.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html.c
</span> @@ -56,6 +56,9 @@ unsigned char ALST_INPUT[] =
ATTR_CORE
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17702,7 +17860,7 @@ index bca227e..d9f08e9 100644
</span> diff --git a/html.h b/html.h
index 7abbd3b..2a9a431 100644
--- a/html.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ html.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html.h
</span> @@ -1,20 +1,20 @@
/* $Id: html.h,v 1.31 2010/08/14 01:29:40 htrb Exp $ */
#ifndef _HTML_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17782,7 +17940,7 @@ index 7abbd3b..2a9a431 100644
</span> diff --git a/image.c b/image.c
index 5f5991a..91034ee 100644
--- a/image.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ image.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/image.c
</span> @@ -44,6 +44,8 @@ initImage()
activeImage = TRUE;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18169,9 +18327,27 @@ index 5f5991a..91034ee 100644
</span> if (cache->width == 0)
cache->width = 1;
diff --git a/indep.c b/indep.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 65b04aa..5c5de06 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 65b04aa..4957c67 100644
</span> --- a/indep.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ indep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/indep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@ unsigned char QUOTE_MAP[0x100] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* SPC ! " # $ % & ' ( ) * + , - . / */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 24, 72, 76, 40, 8, 40, 41, 72, 72, 72, 72, 40, 72, 8, 0, 64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 24, 72, 76, 40, 8, 40, 41, 77, 72, 72, 72, 40, 72, 8, 0, 64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 72, 74, 72, 75, 40,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* @ A B C D E F G H I J K L M N O */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@ char *HTML_QUOTE_MAP[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "<",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ">",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span> @@ -357,6 +357,20 @@ strcasemstr(char *str, char *srch[], char **ret_ptr)
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18193,6 +18369,15 @@ index 65b04aa..5c5de06 100644
</span> char *
remove_space(char *str)
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -448,7 +462,7 @@ getescapechar(char **str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q = p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (p++; IS_ALNUM(*p); p++) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q = allocStr(q, p - q);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (strcasestr("lt gt amp quot nbsp", q) && *p != '=') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strcasestr("lt gt amp quot apos nbsp", q) && *p != '=') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* a character entity MUST be terminated with ";". However,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * there's MANY web pages which uses < , > or something
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * like them as <, >, etc. Therefore, we treat the most
</span> @@ -707,6 +721,111 @@ shell_quote(char *str)
return str;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18306,9 +18491,9 @@ index 65b04aa..5c5de06 100644
</span> w3m_dir(const char *name, char *dft)
{
diff --git a/indep.h b/indep.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b3819a3..2809832 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b3819a3..5c6b1da 100644
</span> --- a/indep.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ indep.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/indep.h
</span> @@ -1,7 +1,7 @@
/* $Id: indep.h,v 1.16 2003/09/22 21:02:19 ukai Exp $ */
#ifndef INDEP_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18333,6 +18518,15 @@ index b3819a3..2809832 100644
</span> #define RAW_MODE 0
#define PAGER_MODE 1
#define HTML_MODE 2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned char QUOTE_MAP[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *HTML_QUOTE_MAP[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define HTML_QUOTE_MASK 0x07 /* &, <, >, " */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HTML_QUOTE_MASK 0x07 /* &, <, >, ", ' */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SHELL_UNSAFE_MASK 0x08 /* [^A-Za-z0-9_./:\200-\377] */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define URL_QUOTE_MASK 0x10 /* [\0- \177-\377] */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FILE_QUOTE_MASK 0x30 /* [\0- #%&+:?\177-\377] */
</span> @@ -52,6 +60,7 @@ extern int strncasecmp(const char *s1, const char *s2, size_t n);
extern char *strcasestr(const char *s1, const char *s2);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18377,7 +18571,7 @@ index b3819a3..2809832 100644
</span> diff --git a/istream.c b/istream.c
index 8967280..74adac5 100644
--- a/istream.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ istream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/istream.c
</span> @@ -22,8 +22,8 @@
static void basic_close(int *handle);
static int basic_read(int *handle, char *buf, int len);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18818,7 +19012,7 @@ index 8967280..74adac5 100644
</span> diff --git a/istream.h b/istream.h
index a220d8b..5a04be0 100644
--- a/istream.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ istream.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/istream.h
</span> @@ -2,13 +2,13 @@
#ifndef IO_STREAM_H
#define IO_STREAM_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18879,9 +19073,18 @@ index a220d8b..5a04be0 100644
</span> extern int ISeos(InputStream stream);
#ifdef USE_SSL
diff --git a/keybind.c b/keybind.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a490962..fec0c65 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a490962..e9ef08b 100644
</span> --- a/keybind.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ keybind.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keybind.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,7 @@ unsigned char GlobalKeymap[128] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* C-p C-q C-r C-s C-t C-u C-v C-w */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ movU, closeT, isrchbak, isrchfor, tabA, prevA, pgFore, wrapToggle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* C-x C-y C-z C-[ C-\ C-] C-^ C-_ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nulcmd, nulcmd, susp, escmap, nulcmd, nulcmd, nulcmd, nulcmd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nulcmd, nulcmd, susp, escmap, nulcmd, nulcmd, nulcmd, goHome,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* SPC ! " # $ % & ' */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgFore, execsh, reMark, pipesh, linend, nulcmd, nulcmd, nulcmd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ( ) * + , - . / */
</span> @@ -91,7 +91,7 @@ unsigned char EscBKeymap[128] = {
/* 0 1 2 3 4 5 6 7 */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18894,7 +19097,7 @@ index a490962..fec0c65 100644
</span> diff --git a/keybind_lynx.c b/keybind_lynx.c
index 163f6b2..42267ec 100644
--- a/keybind_lynx.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ keybind_lynx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keybind_lynx.c
</span> @@ -99,7 +99,7 @@ unsigned char EscBKeymap[128] = {
/* 0 1 2 3 4 5 6 7 */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18907,7 +19110,7 @@ index 163f6b2..42267ec 100644
</span> diff --git a/libwc/ambwidth_map.awk b/libwc/ambwidth_map.awk
index 8544f58..1d9d25f 100644
--- a/libwc/ambwidth_map.awk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/ambwidth_map.awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/ambwidth_map.awk
</span> @@ -3,9 +3,15 @@ BEGIN {
i = 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18962,7 +19165,7 @@ index 8544f58..1d9d25f 100644
</span> diff --git a/libwc/charset.c b/libwc/charset.c
index 3f0b74d..ea79b1c 100644
--- a/libwc/charset.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/charset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/charset.c
</span> @@ -1,8 +1,7 @@
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18976,7 +19179,7 @@ index 3f0b74d..ea79b1c 100644
</span> diff --git a/libwc/gb18030.c b/libwc/gb18030.c
index c195d49..d5c9018 100644
--- a/libwc/gb18030.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/gb18030.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/gb18030.c
</span> @@ -151,6 +151,7 @@ wc_ucs_to_gb18030(wc_uint32 ucs)
return cc;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18988,7 +19191,7 @@ index c195d49..d5c9018 100644
</span> diff --git a/libwc/iso2022.c b/libwc/iso2022.c
index 33d9a19..a191f28 100644
--- a/libwc/iso2022.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/iso2022.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/iso2022.c
</span> @@ -405,7 +405,8 @@ wc_push_to_iso2022(Str os, wc_wchar_t cc, wc_status *st)
case WC_CCS_A_CS94:
if (cc.ccs == WC_CCS_US_ASCII)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19051,7 +19254,7 @@ index 33d9a19..a191f28 100644
</span> diff --git a/libwc/johab.c b/libwc/johab.c
index 8d587b8..498b1bb 100644
--- a/libwc/johab.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/johab.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/johab.c
</span> @@ -160,9 +160,9 @@ wc_N_to_johab1(wc_uint32 code)
{
wc_uint32 a, b, c;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19068,7 +19271,7 @@ index 8d587b8..498b1bb 100644
</span> diff --git a/libwc/map/big5_ucs.map b/libwc/map/big5_ucs.map
index 0c6fd12..ac817a9 100644
--- a/libwc/map/big5_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/big5_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/big5_ucs.map
</span> @@ -1,6 +1,8 @@
/* Big5 (Chinese Taiwan) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19082,7 +19285,7 @@ index 0c6fd12..ac817a9 100644
</span> diff --git a/libwc/map/cns11643_ucs.map b/libwc/map/cns11643_ucs.map
index b426dd3..fcba334 100644
--- a/libwc/map/cns11643_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/cns11643_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/cns11643_ucs.map
</span> @@ -1,6 +1,8 @@
/* CNS 11643 (Chinese Taiwan) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19107,7 +19310,7 @@ index b426dd3..fcba334 100644
</span> diff --git a/libwc/map/gb12345_ucs.map b/libwc/map/gb12345_ucs.map
index 55558c7..3fb338d 100644
--- a/libwc/map/gb12345_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/gb12345_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/gb12345_ucs.map
</span> @@ -1,6 +1,8 @@
/* GB 12345 (Chinese) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19121,7 +19324,7 @@ index 55558c7..3fb338d 100644
</span> diff --git a/libwc/map/gb2312_ucs.map b/libwc/map/gb2312_ucs.map
index 38fb88f..3d37465 100644
--- a/libwc/map/gb2312_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/gb2312_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/gb2312_ucs.map
</span> @@ -1,6 +1,8 @@
/* GB 2312 (Chinese) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19135,7 +19338,7 @@ index 38fb88f..3d37465 100644
</span> diff --git a/libwc/map/gbk_ucs.map b/libwc/map/gbk_ucs.map
index 5a0d5ba..d092fd7 100644
--- a/libwc/map/gbk_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/gbk_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/gbk_ucs.map
</span> @@ -6,7 +6,9 @@ static wc_map ucs_gbk_80_map[ N_ucs_gbk_80_map ] = {
{ 0x20AC, 0x0080 },
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19150,7 +19353,7 @@ index 5a0d5ba..d092fd7 100644
</span> diff --git a/libwc/map/hkscs_ucs.map b/libwc/map/hkscs_ucs.map
index 96d1566..2fbe6b4 100644
--- a/libwc/map/hkscs_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/hkscs_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/hkscs_ucs.map
</span> @@ -1,6 +1,8 @@
/* HKSCS (Chinese Hong Kong) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19164,7 +19367,7 @@ index 96d1566..2fbe6b4 100644
</span> diff --git a/libwc/map/jisx0208x0212x0213_ucs.map b/libwc/map/jisx0208x0212x0213_ucs.map
index 1a1d706..28c2a6c 100644
--- a/libwc/map/jisx0208x0212x0213_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/jisx0208x0212x0213_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/jisx0208x0212x0213_ucs.map
</span> @@ -1,6 +1,8 @@
/* JIS X 0208, JIS X 0212, JIS X 0213 (Japanese) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19189,7 +19392,7 @@ index 1a1d706..28c2a6c 100644
</span> diff --git a/libwc/map/ksx1001_ucs.map b/libwc/map/ksx1001_ucs.map
index 9a17d61..cb62f98 100644
--- a/libwc/map/ksx1001_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/ksx1001_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/ksx1001_ucs.map
</span> @@ -1,6 +1,8 @@
/* KS X 1001 (Korean) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19203,7 +19406,7 @@ index 9a17d61..cb62f98 100644
</span> diff --git a/libwc/map/sjis_ext_ucs.map b/libwc/map/sjis_ext_ucs.map
index a82995c..cc748ba 100644
--- a/libwc/map/sjis_ext_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/sjis_ext_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/sjis_ext_ucs.map
</span> @@ -1,6 +1,8 @@
/* Shift_JIS/CP932 (Japanese) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19217,7 +19420,7 @@ index a82995c..cc748ba 100644
</span> diff --git a/libwc/map/ucs_ambwidth.map b/libwc/map/ucs_ambwidth.map
index 6f03ba8..35ceedb 100644
--- a/libwc/map/ucs_ambwidth.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/ucs_ambwidth.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/ucs_ambwidth.map
</span> @@ -1,50 +1,82 @@
static wc_map ucs_ambwidth_map[] = {
{ 0x00A1, 0x00A1 },
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19398,7 +19601,7 @@ index 6f03ba8..35ceedb 100644
</span> diff --git a/libwc/map/uhc_ucs.map b/libwc/map/uhc_ucs.map
index b6b43ca..55efc09 100644
--- a/libwc/map/uhc_ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/map/uhc_ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/map/uhc_ucs.map
</span> @@ -1,6 +1,8 @@
/* UHC/CP949 (Korean) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19412,7 +19615,7 @@ index b6b43ca..55efc09 100644
</span> diff --git a/libwc/status.c b/libwc/status.c
index d25c924..4a2ebf8 100644
--- a/libwc/status.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/status.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/status.c
</span> @@ -1,7 +1,6 @@
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19425,7 +19628,7 @@ index d25c924..4a2ebf8 100644
</span> diff --git a/libwc/ucs.c b/libwc/ucs.c
index d7b6948..18c3a67 100644
--- a/libwc/ucs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/ucs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/ucs.c
</span> @@ -100,6 +100,7 @@ wc_ucs_to_any(wc_uint32 ucs, wc_table *t)
return t->conv(t->ccs, map->code2);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19485,7 +19688,7 @@ index d7b6948..18c3a67 100644
</span> diff --git a/libwc/ucs.map b/libwc/ucs.map
index dfac6d9..bed5dff 100644
--- a/libwc/ucs.map
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/ucs.map
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/ucs.map
</span> @@ -175,6 +175,49 @@ static wc_uint16 *pcs_ucs_map[] = {
NULL, /* (Raw) */
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19611,7 +19814,7 @@ index dfac6d9..bed5dff 100644
</span> diff --git a/libwc/wtf.c b/libwc/wtf.c
index b8cfdc7..94d95c1 100644
--- a/libwc/wtf.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/wtf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/wtf.c
</span> @@ -120,29 +120,36 @@ int
wtf_strwidth(wc_uchar *p)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19745,7 +19948,7 @@ index b8cfdc7..94d95c1 100644
</span> diff --git a/libwc/wtf.h b/libwc/wtf.h
index ad47973..435526f 100644
--- a/libwc/wtf.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libwc/wtf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libwc/wtf.h
</span> @@ -59,8 +59,7 @@ extern void wtf_init(wc_ces ces1, wc_ces ces2);
#define wtf_width(p) (WcOption.use_wide ? (int)WTF_WIDTH_MAP[(wc_uchar)*(p)] \
: ((int)WTF_WIDTH_MAP[(wc_uchar)*(p)] ? 1 : 0))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19759,7 +19962,7 @@ index ad47973..435526f 100644
</span> diff --git a/linein.c b/linein.c
index b7e81b6..d8f9023 100644
--- a/linein.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ linein.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/linein.c
</span> @@ -714,7 +714,8 @@ _rdcompl(void)
static void
next_dcompl(int next)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19805,7 +20008,7 @@ index b7e81b6..d8f9023 100644
</span> diff --git a/local.c b/local.c
index f5a73a2..56d589d 100644
--- a/local.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ local.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/local.c
</span> @@ -109,6 +109,7 @@ loadLocalDir(char *dname)
n++;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19915,7 +20118,7 @@ index f5a73a2..56d589d 100644
</span> diff --git a/mailcap.c b/mailcap.c
index c0461df..f0c6242 100644
--- a/mailcap.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mailcap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/mailcap.c
</span> @@ -72,7 +72,7 @@ searchMailcap(struct mailcap *table, char *type)
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19926,9 +20129,9 @@ index c0461df..f0c6242 100644
</span> int quoted;
char *q = NULL;
diff --git a/main.c b/main.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b421943..43e181c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b421943..2fcc60c 100644
</span> --- a/main.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/main.c
</span> @@ -1,6 +1,7 @@
/* $Id: main.c,v 1.270 2010/08/24 10:11:51 htrb Exp $ */
#define MAINPROGRAM
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19993,7 +20196,16 @@ index b421943..43e181c 100644
</span> fprintf(f, " -X don't use termcap init/deinit\n");
fprintf(f,
" -title[=TERM] set buffer name to terminal title string\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,6 +384,13 @@ make_optional_header_string(char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,6 +375,8 @@ make_optional_header_string(char *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Strcopy_charp_n(hs, s, p - s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!Strcasecmp_charp(hs, "content-type"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ override_content_type = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!Strcasecmp_charp(hs, "user-agent"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ override_user_agent = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Strcat_charp(hs, ": ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (*(++p)) { /* not null header */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIP_BLANKS(p); /* skip white spaces */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,12 +386,19 @@ make_optional_header_string(char *s)
</span> return hs;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20007,7 +20219,15 @@ index b421943..43e181c 100644
</span> int
main(int argc, char **argv, char **envp)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,7 +416,15 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Buffer *newbuf = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *p, c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int c, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ InputStream redin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *line_str = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **load_argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,7 +418,15 @@ main(int argc, char **argv, char **envp)
</span> wc_ces CodePage;
#endif
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20023,7 +20243,7 @@ index b421943..43e181c 100644
</span> #if defined(ENABLE_NLS) || (defined(USE_M17N) && defined(HAVE_LANGINFO_CODESET))
setlocale(LC_ALL, "");
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -418,6 +445,10 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -418,6 +447,10 @@ main(int argc, char **argv, char **envp)
</span>
CurrentDir = currentdir();
CurrentPid = (int)getpid();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20034,7 +20254,7 @@ index b421943..43e181c 100644
</span> BookmarkFile = NULL;
config_file = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -530,12 +561,14 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -530,12 +563,14 @@ main(int argc, char **argv, char **envp)
</span> PagerMax = atoi(argv[i]);
}
#ifdef USE_M17N
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20049,7 +20269,7 @@ index b421943..43e181c 100644
</span> else if (!strncmp("-I", argv[i], 2)) {
if (argv[i][2] != '\0')
p = argv[i] + 2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -660,6 +693,12 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -660,6 +695,12 @@ main(int argc, char **argv, char **envp)
</span> }
}
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20062,7 +20282,7 @@ index b421943..43e181c 100644
</span> else if (!strcmp("-num", argv[i]))
showLineNum = TRUE;
else if (!strcmp("-no-proxy", argv[i]))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -703,7 +742,11 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,7 +744,11 @@ main(int argc, char **argv, char **envp)
</span> accept_cookie = TRUE;
}
#endif /* USE_COOKIE */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20074,7 +20294,7 @@ index b421943..43e181c 100644
</span> squeezeBlankLine = TRUE;
else if (!strcmp("-X", argv[i]))
Do_not_use_ti_te = TRUE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -735,6 +778,15 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -735,6 +780,15 @@ main(int argc, char **argv, char **envp)
</span> else if (!strcmp("-reqlog",argv[i])) {
w3m_reqlog=rcFile("request.log");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20090,7 +20310,7 @@ index b421943..43e181c 100644
</span> else {
usage();
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -823,6 +875,30 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -823,6 +877,30 @@ main(int argc, char **argv, char **envp)
</span>
if (w3m_backend)
backend();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20121,7 +20341,7 @@ index b421943..43e181c 100644
</span>
if (w3m_dump)
mySignal(SIGINT, SIG_IGN);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -833,7 +909,12 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -833,7 +911,12 @@ main(int argc, char **argv, char **envp)
</span> mySignal(SIGPIPE, SigPipe);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20134,7 +20354,7 @@ index b421943..43e181c 100644
</span> err_msg = Strnew();
if (load_argc == 0) {
/* no URL specified */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -894,12 +975,17 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -894,12 +977,17 @@ main(int argc, char **argv, char **envp)
</span> if (i >= 0) {
SearchHeader = search_header;
DefaultType = default_type;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20155,7 +20375,7 @@ index b421943..43e181c 100644
</span> }
else {
if (post_file && i == 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -928,9 +1014,7 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -928,9 +1016,7 @@ main(int argc, char **argv, char **envp)
</span> else {
request = NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20166,7 +20386,7 @@ index b421943..43e181c 100644
</span> }
if (newbuf == NULL) {
/* FIXME: gettextize? */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -945,7 +1029,7 @@ main(int argc, char **argv, char **envp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -945,7 +1031,7 @@ main(int argc, char **argv, char **envp)
</span> break;
case SCM_LOCAL:
case SCM_LOCAL_CGI:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20175,7 +20395,7 @@ index b421943..43e181c 100644
</span> default:
pushHashHist(URLHist, parsedURL2Str(&newbuf->currentURL)->ptr);
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1183,13 +1267,13 @@ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1183,13 +1269,13 @@ static void
</span> dump_source(Buffer *buf)
{
FILE *f;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20191,7 +20411,7 @@ index b421943..43e181c 100644
</span> putchar(c);
}
fclose(f);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1246,6 +1330,12 @@ dump_extra(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1246,6 +1332,12 @@ dump_extra(Buffer *buf)
</span> #endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20204,7 +20424,7 @@ index b421943..43e181c 100644
</span> static void
do_dump(Buffer *buf)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1266,18 +1356,20 @@ do_dump(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1266,18 +1358,20 @@ do_dump(Buffer *buf)
</span> int i;
saveBuffer(buf, stdout, FALSE);
if (displayLinkNumber && buf->href) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20235,7 +20455,7 @@ index b421943..43e181c 100644
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1547,7 +1639,7 @@ nscroll(int n, int mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1547,7 +1641,7 @@ nscroll(int n, int mode)
</span> }
/* Move page forward */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20244,7 +20464,7 @@ index b421943..43e181c 100644
</span> {
if (vi_prec_num)
nscroll(searchKeyNum() * (Currentbuf->LINES - 1), B_NORMAL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1557,7 +1649,7 @@ DEFUN(pgFore, NEXT_PAGE, "Move to next page")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1557,7 +1651,7 @@ DEFUN(pgFore, NEXT_PAGE, "Move to next page")
</span> }
/* Move page backward */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20253,7 +20473,7 @@ index b421943..43e181c 100644
</span> {
if (vi_prec_num)
nscroll(-searchKeyNum() * (Currentbuf->LINES - 1), B_NORMAL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1566,20 +1658,32 @@ DEFUN(pgBack, PREV_PAGE, "Move to previous page")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1566,20 +1660,32 @@ DEFUN(pgBack, PREV_PAGE, "Move to previous page")
</span> * (Currentbuf->LINES - 1)), prec_num ? B_SCROLL : B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20289,7 +20509,7 @@ index b421943..43e181c 100644
</span> {
int offsety;
if (Currentbuf->firstLine == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1598,7 +1702,7 @@ DEFUN(ctrCsrV, CENTER_V, "Move to the center column")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1598,7 +1704,7 @@ DEFUN(ctrCsrV, CENTER_V, "Move to the center column")
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20298,7 +20518,7 @@ index b421943..43e181c 100644
</span> {
int offsetx;
if (Currentbuf->firstLine == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1612,7 +1716,7 @@ DEFUN(ctrCsrH, CENTER_H, "Move to the center line")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1612,7 +1718,7 @@ DEFUN(ctrCsrH, CENTER_H, "Move to the center line")
</span> }
/* Redraw screen */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20307,7 +20527,7 @@ index b421943..43e181c 100644
</span> {
clear();
arrangeCursor(Currentbuf);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1844,19 +1948,23 @@ srch_nxtprv(int reverse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1844,19 +1950,23 @@ srch_nxtprv(int reverse)
</span> result = srchcore(SearchString, routine[reverse]);
if (result & SR_FOUND)
clear_mark(Currentbuf->currentLine);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20333,7 +20553,7 @@ index b421943..43e181c 100644
</span> {
srch_nxtprv(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1919,7 +2027,7 @@ DEFUN(col1R, RIGHT, "Shift screen one column right")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1919,7 +2029,7 @@ DEFUN(col1R, RIGHT, "Shift screen one column right")
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20342,7 +20562,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf = Currentbuf;
Line *l = buf->currentLine;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1960,7 +2068,7 @@ DEFUN(setEnv, SETENV, "Set environment variable")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1960,7 +2070,7 @@ DEFUN(setEnv, SETENV, "Set environment variable")
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20351,7 +20571,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
char *cmd, *tmpf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2006,7 +2114,7 @@ DEFUN(pipeBuf, PIPE_BUF, "Send rendered document to pipe")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2006,7 +2116,7 @@ DEFUN(pipeBuf, PIPE_BUF, "Send rendered document to pipe")
</span> }
/* Execute shell command and read output ac pipe. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20360,7 +20580,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
char *cmd;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2037,7 +2145,7 @@ DEFUN(pipesh, PIPE_SHELL, "Execute shell command and browse")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2037,7 +2147,7 @@ DEFUN(pipesh, PIPE_SHELL, "Execute shell command and browse")
</span> }
/* Execute shell command and load entire output to buffer */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20369,7 +20589,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
MySignalHandler(*prevtrap) ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2074,7 +2182,7 @@ DEFUN(readsh, READ_SHELL, "Execute shell command and load")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2074,7 +2184,7 @@ DEFUN(readsh, READ_SHELL, "Execute shell command and load")
</span> }
/* Execute shell command */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20378,7 +20598,7 @@ index b421943..43e181c 100644
</span> {
char *cmd;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2099,7 +2207,7 @@ DEFUN(execsh, EXEC_SHELL SHELL, "Execute shell command")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2099,7 +2209,7 @@ DEFUN(execsh, EXEC_SHELL SHELL, "Execute shell command")
</span> }
/* Load file */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20387,7 +20607,7 @@ index b421943..43e181c 100644
</span> {
char *fn;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2118,7 +2226,7 @@ DEFUN(ldfile, LOAD, "Load local file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2118,7 +2228,7 @@ DEFUN(ldfile, LOAD, "Load local file")
</span> }
/* Load help file */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20396,7 +20616,7 @@ index b421943..43e181c 100644
</span> {
#ifdef USE_HELP_CGI
char *lang;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2167,13 +2275,12 @@ _movL(int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2167,13 +2277,12 @@ _movL(int n)
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20412,7 +20632,7 @@ index b421943..43e181c 100644
</span> {
_movL(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2190,14 +2297,12 @@ _movD(int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2190,14 +2299,12 @@ _movD(int n)
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20429,7 +20649,7 @@ index b421943..43e181c 100644
</span> {
_movD(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2214,13 +2319,12 @@ _movU(int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2214,13 +2321,12 @@ _movU(int n)
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20445,7 +20665,7 @@ index b421943..43e181c 100644
</span> {
_movU(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2237,14 +2341,12 @@ _movR(int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2237,14 +2343,12 @@ _movR(int n)
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20462,7 +20682,7 @@ index b421943..43e181c 100644
</span> {
_movR(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2261,7 +2363,7 @@ DEFUN(movR1, MOVE_RIGHT1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2261,7 +2365,7 @@ DEFUN(movR1, MOVE_RIGHT1,
</span> static wc_uint32
getChar(char *p)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20471,7 +20691,7 @@ index b421943..43e181c 100644
</span> }
static int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2296,7 +2398,7 @@ prev_nonnull_line(Line *line)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2296,7 +2400,7 @@ prev_nonnull_line(Line *line)
</span> return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20480,7 +20700,7 @@ index b421943..43e181c 100644
</span> {
char *lb;
Line *pline, *l;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2364,7 +2466,7 @@ next_nonnull_line(Line *line)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2364,7 +2468,7 @@ next_nonnull_line(Line *line)
</span> return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20489,7 +20709,7 @@ index b421943..43e181c 100644
</span> {
char *lb;
Line *pline, *l;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2442,19 +2544,19 @@ _quitfm(int confirm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2442,19 +2546,19 @@ _quitfm(int confirm)
</span> }
/* Quit */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20512,7 +20732,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
int ok;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2502,7 +2604,7 @@ DEFUN(selBuf, SELECT, "Go to buffer selection panel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2502,7 +2606,7 @@ DEFUN(selBuf, SELECT, "Go to buffer selection panel")
</span> }
/* Suspend (on BSD), or run interactive shell (on SysV) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20521,7 +20741,7 @@ index b421943..43e181c 100644
</span> {
#ifndef SIGSTOP
char *shell;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2517,7 +2619,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Stop loading document")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2517,7 +2621,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Stop loading document")
</span> shell = "/bin/sh";
system(shell);
#else /* SIGSTOP */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20539,7 +20759,7 @@ index b421943..43e181c 100644
</span> #endif /* SIGSTOP */
fmInit();
displayBuffer(Currentbuf, B_FORCE_REDRAW);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2550,7 +2662,7 @@ _goLine(char *l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2550,7 +2664,7 @@ _goLine(char *l)
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20548,7 +20768,7 @@ index b421943..43e181c 100644
</span> {
char *str = searchKeyData();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2575,7 +2687,7 @@ DEFUN(goLineL, END, "Go to the last line")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2575,7 +2689,7 @@ DEFUN(goLineL, END, "Go to the last line")
</span> }
/* Go to the beginning of the line */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20557,7 +20777,7 @@ index b421943..43e181c 100644
</span> {
if (Currentbuf->firstLine == NULL)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2587,7 +2699,7 @@ DEFUN(linbeg, LINE_BEGIN, "Go to the beginning of line")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2587,7 +2701,7 @@ DEFUN(linbeg, LINE_BEGIN, "Go to the beginning of line")
</span> }
/* Go to the bottom of the line */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20566,7 +20786,7 @@ index b421943..43e181c 100644
</span> {
if (Currentbuf->firstLine == NULL)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2616,7 +2728,7 @@ cur_real_linenumber(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2616,7 +2730,7 @@ cur_real_linenumber(Buffer *buf)
</span> }
/* Run editor on the current buffer */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20575,7 +20795,7 @@ index b421943..43e181c 100644
</span> {
char *fn = Currentbuf->filename;
Str cmd;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2643,7 +2755,7 @@ DEFUN(editBf, EDIT, "Edit current document")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2643,7 +2757,7 @@ DEFUN(editBf, EDIT, "Edit current document")
</span> }
/* Run editor on the current screen */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20584,7 +20804,7 @@ index b421943..43e181c 100644
</span> {
char *tmpf;
FILE *f;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2681,7 +2793,7 @@ DEFUN(_mark, MARK, "Set/unset mark")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2681,7 +2795,7 @@ DEFUN(_mark, MARK, "Set/unset mark")
</span> }
/* Go to next mark */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20593,7 +20813,7 @@ index b421943..43e181c 100644
</span> {
Line *l;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2714,7 +2826,7 @@ DEFUN(nextMk, NEXT_MARK, "Move to next word")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2714,7 +2828,7 @@ DEFUN(nextMk, NEXT_MARK, "Move to next word")
</span> }
/* Go to previous mark */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20602,7 +20822,7 @@ index b421943..43e181c 100644
</span> {
Line *l;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2749,7 +2861,7 @@ DEFUN(prevMk, PREV_MARK, "Move to previous mark")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2749,7 +2863,7 @@ DEFUN(prevMk, PREV_MARK, "Move to previous mark")
</span> }
/* Mark place to which the regular expression matches */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20611,7 +20831,7 @@ index b421943..43e181c 100644
</span> {
Line *l;
char *str;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2804,12 +2916,15 @@ loadLink(char *url, char *target, char *referer, FormList *request)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2804,12 +2918,15 @@ loadLink(char *url, char *target, char *referer, FormList *request)
</span> union frameset_element *f_element = NULL;
int flag = 0;
ParsedURL *base, pu;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20628,7 +20848,7 @@ index b421943..43e181c 100644
</span> base->scheme == SCM_LOCAL || base->scheme == SCM_LOCAL_CGI)
referer = NO_REFERER;
if (referer == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2830,7 +2945,7 @@ loadLink(char *url, char *target, char *referer, FormList *request)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2830,7 +2947,7 @@ loadLink(char *url, char *target, char *referer, FormList *request)
</span> if (!on_target) /* open link as an indivisual page */
return loadNormalBuf(buf, TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20637,7 +20857,7 @@ index b421943..43e181c 100644
</span> return loadNormalBuf(buf, FALSE);
if (target == NULL || /* no target specified (that means this page is not a frame page) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2959,9 +3074,8 @@ handleMailto(char *url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2959,9 +3076,8 @@ handleMailto(char *url)
</span> }
/* follow HREF link */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20648,7 +20868,7 @@ index b421943..43e181c 100644
</span> Anchor *a;
ParsedURL u;
#ifdef USE_IMAGE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2971,7 +3085,6 @@ DEFUN(followA, GOTO_LINK, "Go to current link")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2971,7 +3087,6 @@ DEFUN(followA, GOTO_LINK, "Go to current link")
</span>
if (Currentbuf->firstLine == NULL)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20656,7 +20876,7 @@ index b421943..43e181c 100644
</span>
#ifdef USE_IMAGE
a = retrieveCurrentImg(Currentbuf);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3051,15 +3164,13 @@ bufferA(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3051,15 +3166,13 @@ bufferA(void)
</span> }
/* view inline image */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20673,7 +20893,7 @@ index b421943..43e181c 100644
</span>
a = retrieveCurrentImg(Currentbuf);
if (a == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3309,7 +3420,6 @@ followForm(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3309,7 +3422,6 @@ followForm(void)
</span> static void
_followForm(int submit)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20681,7 +20901,7 @@ index b421943..43e181c 100644
</span> Anchor *a, *a2;
char *p;
FormItemList *fi, *f2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3318,7 +3428,6 @@ _followForm(int submit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3318,7 +3430,6 @@ _followForm(int submit)
</span>
if (Currentbuf->firstLine == NULL)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20689,7 +20909,7 @@ index b421943..43e181c 100644
</span>
a = retrieveCurrentForm(Currentbuf);
if (a == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3423,7 +3532,6 @@ _followForm(int submit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3423,7 +3534,6 @@ _followForm(int submit)
</span> case FORM_INPUT_BUTTON:
do_submit:
tmp = Strnew();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20697,7 +20917,7 @@ index b421943..43e181c 100644
</span> multipart = (fi->parent->method == FORM_METHOD_POST &&
fi->parent->enctype == FORM_ENCTYPE_MULTIPART);
query_from_followform(&tmp, fi, multipart);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3501,7 +3609,7 @@ _followForm(int submit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3501,7 +3611,7 @@ _followForm(int submit)
</span> }
/* go to the top anchor */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20706,7 +20926,7 @@ index b421943..43e181c 100644
</span> {
HmarkerList *hl = Currentbuf->hmarklist;
BufferPoint *po;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3534,7 +3642,7 @@ DEFUN(topA, LINK_BEGIN, "Go to the first link")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3534,7 +3644,7 @@ DEFUN(topA, LINK_BEGIN, "Go to the first link")
</span> }
/* go to the last anchor */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20715,7 +20935,7 @@ index b421943..43e181c 100644
</span> {
HmarkerList *hl = Currentbuf->hmarklist;
BufferPoint *po;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3568,26 +3676,53 @@ DEFUN(lastA, LINK_END, "Go to the last link")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3568,26 +3678,53 @@ DEFUN(lastA, LINK_END, "Go to the last link")
</span> displayBuffer(Currentbuf, B_NORMAL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20773,7 +20993,7 @@ index b421943..43e181c 100644
</span> {
_prevA(TRUE);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3863,43 +3998,43 @@ nextY(int d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3863,43 +4000,43 @@ nextY(int d)
</span> }
/* go to the next left anchor */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20824,7 +21044,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3917,7 +4052,7 @@ DEFUN(nextBf, NEXT, "Move to next buffer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3917,7 +4054,7 @@ DEFUN(nextBf, NEXT, "Move to next buffer")
</span> }
/* go to the previous bufferr */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20833,7 +21053,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3959,7 +4094,7 @@ checkBackBuffer(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3959,7 +4096,7 @@ checkBackBuffer(Buffer *buf)
</span> }
/* delete current buffer and back to the previous buffer */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20842,7 +21062,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf = Currentbuf->linkBuffer[LB_N_FRAME];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3970,7 +4105,7 @@ DEFUN(backBf, BACK, "Back to previous buffer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3970,7 +4107,7 @@ DEFUN(backBf, BACK, "Back to previous buffer")
</span> }
else
/* FIXME: gettextize? */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20851,7 +21071,7 @@ index b421943..43e181c 100644
</span> return;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4008,8 +4143,7 @@ DEFUN(backBf, BACK, "Back to previous buffer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4008,8 +4145,7 @@ DEFUN(backBf, BACK, "Back to previous buffer")
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20861,7 +21081,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf = Currentbuf->nextBuffer;
if (buf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4055,6 +4189,7 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4055,6 +4191,7 @@ goURL0(char *prompt, int relative)
</span> char *url, *referer;
ParsedURL p_url, *current;
Buffer *cur_buf = Currentbuf;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20869,7 +21089,7 @@ index b421943..43e181c 100644
</span>
url = searchKeyData();
if (url == NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4064,11 +4199,8 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4064,11 +4201,8 @@ goURL0(char *prompt, int relative)
</span> current = baseURL(Currentbuf);
if (current) {
char *c_url = parsedURL2Str(current)->ptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20883,7 +21103,7 @@ index b421943..43e181c 100644
</span> else
pushHist(hist, c_url);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4077,11 +4209,8 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4077,11 +4211,8 @@ goURL0(char *prompt, int relative)
</span> char *a_url;
parseURL2(a->url, &p_url, current);
a_url = parsedURL2Str(&p_url)->ptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20897,7 +21117,7 @@ index b421943..43e181c 100644
</span> else
pushHist(hist, a_url);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4089,15 +4218,22 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4089,15 +4220,22 @@ goURL0(char *prompt, int relative)
</span> if (url != NULL)
SKIP_BLANKS(url);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20927,7 +21147,7 @@ index b421943..43e181c 100644
</span> if (url == NULL || *url == '\0') {
displayBuffer(Currentbuf, B_FORCE_REDRAW);
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4106,14 +4242,6 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4106,14 +4244,6 @@ goURL0(char *prompt, int relative)
</span> gotoLabel(url + 1);
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20942,7 +21162,7 @@ index b421943..43e181c 100644
</span> parseURL2(url, &p_url, current);
pushHashHist(URLHist, parsedURL2Str(&p_url)->ptr);
cmd_loadURL(url, current, referer, NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4121,12 +4249,12 @@ goURL0(char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4121,12 +4251,29 @@ goURL0(char *prompt, int relative)
</span> pushHashHist(URLHist, parsedURL2Str(&Currentbuf->currentURL)->ptr);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20953,11 +21173,28 @@ index b421943..43e181c 100644
</span> }
-DEFUN(gorURL, GOTO_RELATIVE, "Go to relative URL")
<span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFUN(goHome, GOTO_HOME, "Open home page in a new buffer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *url;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((url = getenv("HTTP_HOME")) != NULL ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (url = getenv("WWW_HOME")) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ParsedURL p_url;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Buffer *cur_buf = Currentbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SKIP_BLANKS(url);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ url = url_encode(url, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ parseURL2(url, &p_url, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pushHashHist(URLHist, parsedURL2Str(&p_url)->ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmd_loadURL(url, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Currentbuf != cur_buf) /* success */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pushHashHist(URLHist, parsedURL2Str(&Currentbuf->currentURL)->ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +DEFUN(gorURL, GOTO_RELATIVE, "Go to relative address")
{
goURL0("Goto relative URL: ", TRUE);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4151,14 +4279,14 @@ cmd_loadBuffer(Buffer *buf, int prop, int linkid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4151,14 +4298,14 @@ cmd_loadBuffer(Buffer *buf, int prop, int linkid)
</span> }
/* load bookmark */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20974,7 +21211,7 @@ index b421943..43e181c 100644
</span> {
Str tmp;
FormList *request;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4188,7 +4316,7 @@ DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmark")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4188,7 +4335,7 @@ DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmark")
</span> }
/* option setting */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20983,7 +21220,7 @@ index b421943..43e181c 100644
</span> {
cmd_loadBuffer(load_option_panel(), BP_NO_URL, LB_NOLINK);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4223,7 +4351,7 @@ DEFUN(msgs, MSGS, "Display error messages")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4223,7 +4370,7 @@ DEFUN(msgs, MSGS, "Display error messages")
</span> }
/* page info */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20992,7 +21229,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4291,7 +4419,7 @@ follow_map(struct parsed_tagarg *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4291,7 +4438,7 @@ follow_map(struct parsed_tagarg *arg)
</span>
#ifdef USE_MENU
/* link menu */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21001,7 +21238,7 @@ index b421943..43e181c 100644
</span> {
LinkList *l = link_menu(Currentbuf);
ParsedURL p_url;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4329,26 +4457,25 @@ anchorMn(Anchor *(*menu_func) (Buffer *), int go)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4329,26 +4476,25 @@ anchorMn(Anchor *(*menu_func) (Buffer *), int go)
</span> }
/* accesskey */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21032,7 +21269,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4375,14 +4502,14 @@ DEFUN(cooLst, COOKIE, "View cookie list")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4375,14 +4521,14 @@ DEFUN(cooLst, COOKIE, "View cookie list")
</span>
#ifdef USE_HISTORY
/* History page */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21049,7 +21286,7 @@ index b421943..43e181c 100644
</span> {
CurrentKeyData = NULL; /* not allowed in w3m-control: */
do_download = TRUE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4391,7 +4518,7 @@ DEFUN(svA, SAVE_LINK, "Save link to file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4391,7 +4537,7 @@ DEFUN(svA, SAVE_LINK, "Save link to file")
</span> }
/* download IMG link */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21058,7 +21295,7 @@ index b421943..43e181c 100644
</span> {
CurrentKeyData = NULL; /* not allowed in w3m-control: */
do_download = TRUE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4400,7 +4527,7 @@ DEFUN(svI, SAVE_IMAGE, "Save image to file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4400,7 +4546,7 @@ DEFUN(svI, SAVE_IMAGE, "Save image to file")
</span> }
/* save buffer */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21067,7 +21304,7 @@ index b421943..43e181c 100644
</span> {
char *qfile = NULL, *file;
FILE *f;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4449,7 +4576,7 @@ DEFUN(svBuf, PRINT SAVE_SCREEN, "Save rendered document to file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4449,7 +4595,7 @@ DEFUN(svBuf, PRINT SAVE_SCREEN, "Save rendered document to file")
</span> }
/* save source */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21076,7 +21313,7 @@ index b421943..43e181c 100644
</span> {
char *file;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4510,8 +4637,7 @@ _peekURL(int only_img)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4510,8 +4656,7 @@ _peekURL(int only_img)
</span> s = parsedURL2Str(&pu);
}
if (DecodeURL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21086,7 +21323,7 @@ index b421943..43e181c 100644
</span> #ifdef USE_M17N
s = checkType(s, &pp, NULL);
p = NewAtom_N(Lineprop, s->length);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4529,13 +4655,13 @@ _peekURL(int only_img)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4529,13 +4674,13 @@ _peekURL(int only_img)
</span> }
/* peek URL */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21102,7 +21339,7 @@ index b421943..43e181c 100644
</span> {
_peekURL(1);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4549,7 +4675,7 @@ currentURL(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4549,7 +4694,7 @@ currentURL(void)
</span> return parsedURL2Str(&Currentbuf->currentURL);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21111,7 +21348,7 @@ index b421943..43e181c 100644
</span> {
static Str s = NULL;
#ifdef USE_M17N
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4570,7 +4696,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4570,7 +4715,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
</span> offset = 0;
s = currentURL();
if (DecodeURL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21120,7 +21357,7 @@ index b421943..43e181c 100644
</span> #ifdef USE_M17N
s = checkType(s, &pp, NULL);
p = NewAtom_N(Lineprop, s->length);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4588,7 +4714,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4588,7 +4733,7 @@ DEFUN(curURL, PEEK, "Peek current URL")
</span> }
/* view HTML source */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21129,7 +21366,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4679,7 +4805,7 @@ DEFUN(vwSrc, SOURCE VIEW, "View HTML source")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4679,7 +4824,7 @@ DEFUN(vwSrc, SOURCE VIEW, "View HTML source")
</span> }
/* reload */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21138,7 +21375,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf, *fbuf = NULL, sbuf;
#ifdef USE_M17N
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4804,7 +4930,7 @@ DEFUN(reload, RELOAD, "Reload buffer")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4804,7 +4949,7 @@ DEFUN(reload, RELOAD, "Reload buffer")
</span> }
/* reshape */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21147,7 +21384,7 @@ index b421943..43e181c 100644
</span> {
Currentbuf->need_reshape = TRUE;
reshapeBuffer(Currentbuf);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4846,7 +4972,7 @@ change_charset(struct parsed_tagarg *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4846,7 +4991,7 @@ change_charset(struct parsed_tagarg *arg)
</span> _docCSet(charset);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21156,7 +21393,7 @@ index b421943..43e181c 100644
</span> {
char *cs;
wc_ces charset;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4864,7 +4990,7 @@ DEFUN(docCSet, CHARSET, "Change the current document charset")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4864,7 +5009,7 @@ DEFUN(docCSet, CHARSET, "Change the current document charset")
</span> _docCSet(charset);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21165,7 +21402,7 @@ index b421943..43e181c 100644
</span> {
char *cs;
wc_ces charset;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4915,13 +5041,13 @@ chkURLBuffer(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4915,13 +5060,13 @@ chkURLBuffer(Buffer *buf)
</span> buf->check_url |= CHK_URL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21181,7 +21418,7 @@ index b421943..43e181c 100644
</span> {
char *p;
int spos, epos;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4948,15 +5074,15 @@ chkNMIDBuffer(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4948,15 +5093,15 @@ chkNMIDBuffer(Buffer *buf)
</span> buf->check_url |= CHK_NMID;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21200,7 +21437,7 @@ index b421943..43e181c 100644
</span> {
Buffer *buf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5010,6 +5136,24 @@ invoke_browser(char *url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5010,6 +5155,24 @@ invoke_browser(char *url)
</span> case 3:
browser = ExtBrowser3;
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21225,7 +21462,7 @@ index b421943..43e181c 100644
</span> }
if (browser == NULL || *browser == '\0') {
browser = inputStr("Browse command: ", NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5038,7 +5182,7 @@ invoke_browser(char *url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5038,7 +5201,7 @@ invoke_browser(char *url)
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21234,7 +21471,7 @@ index b421943..43e181c 100644
</span> {
if (Currentbuf->bufferprop & BP_INTERNAL) {
/* FIXME: gettextize? */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5055,7 +5199,7 @@ DEFUN(extbrz, EXTERN, "Execute external browser")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5055,7 +5218,7 @@ DEFUN(extbrz, EXTERN, "Execute external browser")
</span> invoke_browser(parsedURL2Str(&Currentbuf->currentURL)->ptr);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21243,7 +21480,7 @@ index b421943..43e181c 100644
</span> {
Anchor *a;
ParsedURL pu;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5070,7 +5214,7 @@ DEFUN(linkbrz, EXTERN_LINK, "View current link using external browser")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5070,7 +5233,7 @@ DEFUN(linkbrz, EXTERN_LINK, "View current link using external browser")
</span> }
/* show current line number and number of lines in the entire document */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21252,7 +21489,7 @@ index b421943..43e181c 100644
</span> {
Line *l = Currentbuf->currentLine;
Str tmp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5362,7 +5506,7 @@ process_mouse(int btn, int x, int y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5362,7 +5525,7 @@ process_mouse(int btn, int x, int y)
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21261,7 +21498,7 @@ index b421943..43e181c 100644
</span> {
if (use_mouse) {
use_mouse = FALSE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5398,6 +5542,60 @@ DEFUN(mouse, MOUSE, "mouse operation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5398,6 +5561,60 @@ DEFUN(mouse, MOUSE, "mouse operation")
</span> process_mouse(btn, x, y);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21322,7 +21559,7 @@ index b421943..43e181c 100644
</span> #ifdef USE_GPM
int
gpm_process_mouse(Gpm_Event * event, void *data)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5451,7 +5649,7 @@ sysm_process_mouse(int x, int y, int nbs, int obs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5451,7 +5668,7 @@ sysm_process_mouse(int x, int y, int nbs, int obs)
</span> }
#endif /* USE_SYSMOUSE */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21331,7 +21568,7 @@ index b421943..43e181c 100644
</span> {
if (!mouse_action.in_action)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5473,7 +5671,7 @@ DEFUN(movMs, MOVE_MOUSE, "Move cursor to mouse cursor (for mouse action)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5473,7 +5690,7 @@ DEFUN(movMs, MOVE_MOUSE, "Move cursor to mouse cursor (for mouse action)")
</span> #define FRAME_WIDTH 1
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21340,7 +21577,7 @@ index b421943..43e181c 100644
</span> {
if (!mouse_action.in_action)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5490,7 +5688,7 @@ DEFUN(menuMs, MENU_MOUSE, "Popup menu at mouse cursor (for mouse action)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5490,7 +5707,7 @@ DEFUN(menuMs, MENU_MOUSE, "Popup menu at mouse cursor (for mouse action)")
</span> }
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21349,7 +21586,7 @@ index b421943..43e181c 100644
</span> {
TabBuffer *tab;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5503,8 +5701,7 @@ DEFUN(tabMs, TAB_MOUSE, "Move to tab on mouse cursor (for mouse action)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5503,8 +5720,7 @@ DEFUN(tabMs, TAB_MOUSE, "Move to tab on mouse cursor (for mouse action)")
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21359,7 +21596,7 @@ index b421943..43e181c 100644
</span> {
TabBuffer *tab;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5518,12 +5715,12 @@ DEFUN(closeTMs, CLOSE_TAB_MOUSE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5518,12 +5734,12 @@ DEFUN(closeTMs, CLOSE_TAB_MOUSE,
</span> }
#endif /* USE_MOUSE */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21374,7 +21611,7 @@ index b421943..43e181c 100644
</span> {
if (WrapSearch) {
WrapSearch = FALSE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5604,7 +5801,7 @@ execdict(char *word)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5604,7 +5820,7 @@ execdict(char *word)
</span> disp_message("Execution failed", TRUE);
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21383,7 +21620,7 @@ index b421943..43e181c 100644
</span> buf->filename = w;
buf->buffername = Sprintf("%s %s", DICTBUFFERNAME, word)->ptr;
if (buf->type == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5671,7 +5868,7 @@ set_buffer_environ(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5671,7 +5887,7 @@ set_buffer_environ(Buffer *buf)
</span> set_environ("W3M_CURRENT_FORM", form2str((FormItemList *)a->url));
else
set_environ("W3M_CURRENT_FORM", "");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21392,7 +21629,7 @@ index b421943..43e181c 100644
</span> l->real_linenumber)->ptr);
set_environ("W3M_CURRENT_COLUMN", Sprintf("%d",
buf->currentColumn +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5747,8 +5944,14 @@ deleteFiles()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5747,8 +5963,14 @@ deleteFiles()
</span> Firstbuf = buf;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21408,7 +21645,7 @@ index b421943..43e181c 100644
</span> }
void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5768,11 +5971,18 @@ w3m_exit(int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5768,11 +5990,18 @@ w3m_exit(int i)
</span> #endif
#ifdef __MINGW32_VERSION
WSACleanup();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21428,7 +21665,7 @@ index b421943..43e181c 100644
</span> {
char *data, *p;
int cmd;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5900,7 +6110,7 @@ setAlarmEvent(AlarmEvent * event, int sec, short status, int cmd, void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5900,7 +6129,7 @@ setAlarmEvent(AlarmEvent * event, int sec, short status, int cmd, void *data)
</span> }
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21437,7 +21674,7 @@ index b421943..43e181c 100644
</span> {
char *resource = searchKeyData();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5969,8 +6179,7 @@ DEFUN(reinit, REINIT, "Reload configuration files")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5969,8 +6198,7 @@ DEFUN(reinit, REINIT, "Reload configuration files")
</span> ptr, FALSE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21447,7 +21684,7 @@ index b421943..43e181c 100644
</span> {
char *data;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6031,7 +6240,7 @@ _newT(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6031,7 +6259,7 @@ _newT(void)
</span> nTab++;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21456,7 +21693,7 @@ index b421943..43e181c 100644
</span> {
_newT();
displayBuffer(Currentbuf, B_REDRAW_IMAGE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6142,7 +6351,7 @@ deleteTab(TabBuffer * tab)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6142,7 +6370,7 @@ deleteTab(TabBuffer * tab)
</span> return FirstTab;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21465,7 +21702,7 @@ index b421943..43e181c 100644
</span> {
TabBuffer *tab;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6157,7 +6366,7 @@ DEFUN(closeT, CLOSE_TAB, "Close current tab")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6157,7 +6385,7 @@ DEFUN(closeT, CLOSE_TAB, "Close current tab")
</span> displayBuffer(Currentbuf, B_REDRAW_IMAGE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21474,7 +21711,7 @@ index b421943..43e181c 100644
</span> {
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6172,7 +6381,7 @@ DEFUN(nextT, NEXT_TAB, "Move to next tab")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6172,7 +6400,7 @@ DEFUN(nextT, NEXT_TAB, "Move to next tab")
</span> displayBuffer(Currentbuf, B_REDRAW_IMAGE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21483,7 +21720,7 @@ index b421943..43e181c 100644
</span> {
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6236,7 +6445,7 @@ followTab(TabBuffer * tab)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6236,7 +6464,7 @@ followTab(TabBuffer * tab)
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21492,7 +21729,7 @@ index b421943..43e181c 100644
</span> {
followTab(prec_num ? numTab(PREC_NUM) : NULL);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6277,13 +6486,13 @@ tabURL0(TabBuffer * tab, char *prompt, int relative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6277,13 +6505,13 @@ tabURL0(TabBuffer * tab, char *prompt, int relative)
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21508,7 +21745,7 @@ index b421943..43e181c 100644
</span> {
tabURL0(prec_num ? numTab(PREC_NUM) : NULL,
"Goto relative URL on new tab: ", TRUE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6328,7 +6537,7 @@ moveTab(TabBuffer * t, TabBuffer * t2, int right)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6328,7 +6556,7 @@ moveTab(TabBuffer * t, TabBuffer * t2, int right)
</span> displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21517,7 +21754,7 @@ index b421943..43e181c 100644
</span> {
TabBuffer *tab;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6338,7 +6547,7 @@ DEFUN(tabR, TAB_RIGHT, "Move current tab right")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6338,7 +6566,7 @@ DEFUN(tabR, TAB_RIGHT, "Move current tab right")
</span> moveTab(CurrentTab, tab ? tab : LastTab, TRUE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21526,7 +21763,7 @@ index b421943..43e181c 100644
</span> {
TabBuffer *tab;
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6547,7 +6756,7 @@ stopDownload(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6547,7 +6775,7 @@ stopDownload(void)
</span> }
/* download panel */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21538,7 +21775,7 @@ index b421943..43e181c 100644
</span> diff --git a/map.c b/map.c
index 90aa35a..bb240ea 100644
--- a/map.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ map.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/map.c
</span> @@ -279,7 +279,7 @@ follow_map_panel(Buffer *buf, char *name)
p = parsedURL2Str(&pu)->ptr;
q = html_quote(p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21635,7 +21872,7 @@ index 90aa35a..bb240ea 100644
</span> diff --git a/matrix.c b/matrix.c
index 64fd0ad..bc7a5be 100644
--- a/matrix.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ matrix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/matrix.c
</span> @@ -34,18 +34,12 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21659,7 +21896,7 @@ index 64fd0ad..bc7a5be 100644
</span> diff --git a/menu.c b/menu.c
index 774b1bd..b0c890d 100644
--- a/menu.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ menu.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/menu.c
</span> @@ -57,6 +57,7 @@ static int mCancel(char c);
static int mClose(char c);
static int mSusp(char c);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21861,7 +22098,7 @@ index 774b1bd..b0c890d 100644
</span> diff --git a/mimehead.c b/mimehead.c
index 78997e0..d16270c 100644
--- a/mimehead.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mimehead.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/mimehead.c
</span> @@ -63,13 +63,23 @@ ha2d(char x, char y)
Str
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22001,7 +22238,7 @@ index 78997e0..d16270c 100644
</span> diff --git a/news.c b/news.c
index 8a1f0e8..c0494b7 100644
--- a/news.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ news.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/news.c
</span> @@ -76,13 +76,15 @@ news_close(News * news)
static int
news_open(News * news)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22023,7 +22260,7 @@ index 8a1f0e8..c0494b7 100644
</span> diff --git a/parsetagx.c b/parsetagx.c
index 6b627d2..1cc7048 100644
--- a/parsetagx.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ parsetagx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/parsetagx.c
</span> @@ -120,6 +120,7 @@ parse_tag(char **s, int internal)
int i, attr_id = 0, nattr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22043,7 +22280,7 @@ index 6b627d2..1cc7048 100644
</span> diff --git a/po/LINGUAS b/po/LINGUAS
index 1489115..ddd267b 100644
--- a/po/LINGUAS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/LINGUAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/LINGUAS
</span> @@ -1,2 +1,2 @@
# Set of available languages.
-ja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22051,7 +22288,7 @@ index 1489115..ddd267b 100644
</span> diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 83d8838..9d9691e 100644
--- a/po/Makefile.in.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/Makefile.in.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/Makefile.in.in
</span> @@ -89,7 +89,7 @@ CATALOGS = @CATALOGS@
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22081,7 +22318,7 @@ index 83d8838..9d9691e 100644
</span> diff --git a/po/Makevars b/po/Makevars
index 2f57810..a60a09d 100644
--- a/po/Makevars
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/Makevars
</span> @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --from-code=EUC-JP --keyword=_ --keyword=N_
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22093,9 +22330,9 @@ index 2f57810..a60a09d 100644
</span> # bugs in the untranslated strings:
diff --git a/po/de.po b/po/de.po
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..b4dcd36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..e271ae7
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/de.po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/de.po
</span> @@ -0,0 +1,936 @@
+# German translation of w3m
+# Copyright (C) 2014 THE w3m'S COPYRIGHT HOLDER
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22691,8 +22928,8 @@ index 0000000..b4dcd36
</span> +msgstr "Datei mit PEM-kodierten Zertifikaten von CAs"
+
+#: rc.c:205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span> +
+#: rc.c:208
+msgid "Enable cookie processing"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23034,9 +23271,9 @@ index 0000000..b4dcd36
</span> +msgid "en;q=1.0"
+msgstr "de;q=1.0, en;q=0.5"
diff --git a/po/ja.po b/po/ja.po
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d67c695..95a5341 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d67c695..5ba7bba 100644
</span> --- a/po/ja.po
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/ja.po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/ja.po
</span> @@ -1,6 +1,6 @@
# Japanese translations for w3m package
# w3m パッケージに対する英訳.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23767,8 +24004,8 @@ index d67c695..95a5341 100644
</span> -msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
-msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t:TLSv1)"
+#: rc.c:205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span>
-#: rc.c:198
+#: rc.c:208
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24174,9 +24411,9 @@ index d67c695..95a5341 100644
</span> msgid "en;q=1.0"
msgstr "ja;q=1.0, en;q=0.5"
diff --git a/po/w3m.pot b/po/w3m.pot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e164b1e..bf38ef8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e164b1e..b09b889 100644
</span> --- a/po/w3m.pot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/w3m.pot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/w3m.pot
</span> @@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Fumitoshi UKAI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24902,7 +25139,7 @@ index e164b1e..bf38ef8 100644
</span> -#: rc.c:195
-msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
+#: rc.c:205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span> msgstr ""
-#: rc.c:198
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25310,9 +25547,9 @@ index e164b1e..bf38ef8 100644
</span> msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..cf25e22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..d1486ed
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/zh_CN.po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/zh_CN.po
</span> @@ -0,0 +1,916 @@
+# zh_CN translation for w3m
+# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25903,8 +26140,8 @@ index 0000000..cf25e22
</span> +msgstr "包含 PEM 编码 CA 证书的文件"
+
+#: rc.c:205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span> +
+#: rc.c:208
+msgid "Enable cookie processing"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26232,9 +26469,9 @@ index 0000000..cf25e22
</span> +msgstr "zh-CN;q=1.0, zh-Hans;q=0.9, zh;q=0.8, en;q=0.6"
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..44f7a14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..d4f98db
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ po/zh_TW.po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/po/zh_TW.po
</span> @@ -0,0 +1,916 @@
+# zh_TW translation for w3m, machine converted
+# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26825,8 +27062,8 @@ index 0000000..44f7a14
</span> +msgstr "包含 PEM 編碼 CA 證書的檔案"
+
+#: rc.c:205
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)"
</span> +
+#: rc.c:208
+msgid "Enable cookie processing"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27153,9 +27390,9 @@ index 0000000..44f7a14
</span> +msgid "en;q=1.0"
+msgstr "zh-TW;q=1.0, zh-Hants;q=0.9, zh;q=0.8, en;q=0.6"
diff --git a/proto.h b/proto.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f8a7345..ed8f890 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f8a7345..d513527 100644
</span> --- a/proto.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/proto.h
</span> @@ -11,6 +11,8 @@ extern void pushEvent(int cmd, void *data);
extern MySignalHandler intTrap(SIGNAL_ARG);
extern void pgFore(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27173,7 +27410,15 @@ index f8a7345..ed8f890 100644
</span> extern void onA(void);
extern void nextA(void);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,6 +165,24 @@ extern Str searchURIMethods(ParsedURL *pu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,6 +81,7 @@ extern void prevBf(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void backBf(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void deletePrevBuf(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void goURL(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void goHome(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void gorURL(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void ldBmark(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void adBmark(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,6 +166,24 @@ extern Str searchURIMethods(ParsedURL *pu);
</span> extern void chkExternalURIBuffer(Buffer *buf);
#endif
extern ParsedURL *schemeToProxy(int scheme);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27198,7 +27443,7 @@ index f8a7345..ed8f890 100644
</span> extern void examineFile(char *path, URLFile *uf);
extern char *acceptableEncoding();
extern int dir_exist(char *path);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +201,6 @@ extern void push_symbol(Str str, char symbol, int width, int n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +202,6 @@ extern void push_symbol(Str str, char symbol, int width, int n);
</span> #ifdef USE_UNICODE
extern void update_utf8_symbol(void);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27206,7 +27451,7 @@ index f8a7345..ed8f890 100644
</span> extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer,
int flag, FormList *request);
extern int is_boundary(unsigned char *, unsigned char *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,6 +227,8 @@ extern int getImageSize(ImageCache * cache);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,6 +228,8 @@ extern int getImageSize(ImageCache * cache);
</span> extern Str process_img(struct parsed_tag *tag, int width);
extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
extern Str process_input(struct parsed_tag *tag);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27215,7 +27460,7 @@ index f8a7345..ed8f890 100644
</span> extern Str process_select(struct parsed_tag *tag);
extern Str process_n_select(void);
extern void feed_select(char *str);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,8 +271,7 @@ extern Buffer *openPagerBuffer(InputStream stream, Buffer *buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,8 +272,7 @@ extern Buffer *openPagerBuffer(InputStream stream, Buffer *buf);
</span> extern Buffer *openGeneralPagerBuffer(InputStream stream);
extern Line *getNextPage(Buffer *buf, int plen);
extern int save2tmp(URLFile uf, char *tmpf);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27225,7 +27470,7 @@ index f8a7345..ed8f890 100644
</span> extern int _doFileCopy(char *tmpf, char *defstr, int download);
#define doFileCopy(tmpf, defstr) _doFileCopy(tmpf, defstr, FALSE);
extern int doFileMove(char *tmpf, char *defstr);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,6 +393,7 @@ extern void align(TextLine *lbuf, int width, int mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,6 +394,7 @@ extern void align(TextLine *lbuf, int width, int mode);
</span> extern void print_item(struct table *t, int row, int col, int width, Str buf);
extern void print_sep(struct table *t, int row, int type, int maxcol, Str buf);
extern void do_refill(struct table *tbl, int row, int col, int maxlimit);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27233,7 +27478,7 @@ index f8a7345..ed8f890 100644
</span> extern void renderTable(struct table *t, int max_width,
struct html_feed_environ *h_env);
extern struct table *begin_table(int border, int spacing, int padding,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -507,7 +529,7 @@ extern ParsedURL *baseURL(Buffer *buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -507,7 +530,7 @@ extern ParsedURL *baseURL(Buffer *buf);
</span> extern int openSocket(char *hostname, char *remoteport_name,
unsigned short remoteport_num);
extern void parseURL(char *url, ParsedURL *p_url, ParsedURL *current);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27242,7 +27487,7 @@ index f8a7345..ed8f890 100644
</span> extern void parseURL2(char *url, ParsedURL *pu, ParsedURL *current);
extern Str parsedURL2Str(ParsedURL *pu);
extern int getURLScheme(char **url);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -586,9 +608,12 @@ extern char *getAnchorText(Buffer *buf, AnchorList *al, Anchor *a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -586,9 +609,12 @@ extern char *getAnchorText(Buffer *buf, AnchorList *al, Anchor *a);
</span> extern Buffer *link_list_panel(Buffer *buf);
extern Str decodeB(char **ww);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27255,7 +27500,7 @@ index f8a7345..ed8f890 100644
</span> #ifdef USE_M17N
extern Str decodeWord(char **ow, wc_ces * charset);
extern Str decodeMIME(Str orgstr, wc_ces * charset);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -611,6 +636,7 @@ extern char *confFile(char *base);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -611,6 +637,7 @@ extern char *confFile(char *base);
</span> extern char *auxbinFile(char *base);
extern char *libFile(char *base);
extern char *helpFile(char *base);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27263,7 +27508,7 @@ index f8a7345..ed8f890 100644
</span> extern Str localCookie(void);
extern Str loadLocalDir(char *dirname);
extern void set_environ(char *var, char *value);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -683,6 +709,7 @@ extern void reMark(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -683,6 +710,7 @@ extern void reMark(void);
</span>
#ifdef USE_MOUSE
extern void mouse(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27271,7 +27516,7 @@ index f8a7345..ed8f890 100644
</span> extern void mouse_init(void);
extern void mouse_end(void);
extern void mouse_active(void);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -698,6 +725,7 @@ extern void tabMs(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -698,6 +726,7 @@ extern void tabMs(void);
</span> extern void closeTMs(void);
#else /* not USE_MOUSE */
#define mouse nulcmd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27279,7 +27524,7 @@ index f8a7345..ed8f890 100644
</span> #define msToggle nulcmd
#define movMs nulcmd
#define menuMs nulcmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -723,6 +751,8 @@ extern int getKey(char *s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -723,6 +752,8 @@ extern int getKey(char *s);
</span> extern char *getKeyData(int key);
extern char *getWord(char **str);
extern char *getQWord(char **str);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27288,16 +27533,16 @@ index f8a7345..ed8f890 100644
</span> #ifdef USE_MOUSE
extern void initMouseAction(void);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -786,5 +816,3 @@ extern void dispVer(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -786,5 +817,3 @@ extern void dispVer(void);
</span> void srand48(long);
long lrand48(void);
#endif
-
-#include "indep.h"
diff --git a/rc.c b/rc.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8441a39..3fd84ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8441a39..a44c5c8 100644
</span> --- a/rc.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rc.c
</span> @@ -9,7 +9,9 @@
#include <errno.h>
#include "parsetag.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27344,7 +27589,7 @@ index 8441a39..3fd84ef 100644
</span> #define CMT_SSL_CA_FILE N_("File consisting of PEM encoded certificates of CAs")
#endif /* USE_SSL_VERIFY */
-#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CMT_SSL_FORBID_METHOD N_("List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t: TLSv1.0, 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3)")
</span> #endif /* USE_SSL */
#ifdef USE_COOKIE
#define CMT_USECOOKIE N_("Enable cookie processing")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27491,7 +27736,7 @@ index 8441a39..3fd84ef 100644
</span> sync_with_option();
backBf();
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1556,3 +1594,217 @@ helpFile(char *base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1556,3 +1594,229 @@ helpFile(char *base)
</span> return expandPath(Strnew_m_charp(w3m_help_dir(), "/", base, NULL)->ptr);
}
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27503,6 +27748,7 @@ index 8441a39..3fd84ef 100644
</span> + * url_charset <charset>
+ * no_referer_from on|off
+ * no_referer_to on|off
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ * user_agent "<string>"
</span> + *
+ * The last match wins.
+ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27515,6 +27761,7 @@ index 8441a39..3fd84ef 100644
</span> + unsigned char mask[(SCONF_N_FIELD + 7) >> 3];
+
+ char *substitute_url;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *user_agent;
</span> +#ifdef USE_M17N
+ wc_ces url_charset;
+#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27541,6 +27788,7 @@ index 8441a39..3fd84ef 100644
</span> + memset(ent->mask, 0, sizeof(ent->mask));
+
+ ent->substitute_url = NULL;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ ent->user_agent = NULL;
</span> +#ifdef USE_M17N
+ ent->url_charset = 0;
+#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27619,6 +27867,10 @@ index 8441a39..3fd84ef 100644
</span> + ent->substitute_url = getQWord(&p);
+ SCONF_SET(ent, SCONF_SUBSTITUTE_URL);
+ }
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strcmp(s, "user_agent") == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ent->user_agent = getQWord(&p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SCONF_SET(ent, SCONF_USER_AGENT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> +#ifdef USE_M17N
+ else if (strcmp(s, "url_charset") == 0) {
+ char *charset = getWord(&p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27698,6 +27950,11 @@ index 8441a39..3fd84ef 100644
</span> + return tmp->ptr;
+ }
+ return NULL;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ case SCONF_USER_AGENT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ent->user_agent && *ent->user_agent) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ent->user_agent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span> +#ifdef USE_M17N
+ case SCONF_URL_CHARSET:
+ return &ent->url_charset;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27712,7 +27969,7 @@ index 8441a39..3fd84ef 100644
</span> diff --git a/regex.c b/regex.c
index 5bee4b2..93406e8 100644
--- a/regex.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ regex.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/regex.c
</span> @@ -77,7 +77,7 @@ static longchar
set_longchar(char *str)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27734,7 +27991,7 @@ index 5bee4b2..93406e8 100644
</span> diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 4da9ce5..5beb9b0 100644
--- a/scripts/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/Makefile.in
</span> @@ -60,7 +60,7 @@ w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/ke
@cat $(srcdir)/w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl
@echo "done"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27766,7 +28023,7 @@ diff --git a/scripts/w3mdict.cgi b/scripts/w3mdict.cgi
</span> new file mode 100755
index 0000000..6b0e62e
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mdict.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mdict.cgi
</span> @@ -0,0 +1,56 @@
+#!/bin/sh
+# w3mdict.cgi - A dictd dictionary query cgi for w3m
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27828,7 +28085,7 @@ diff --git a/scripts/w3mhelp-funcdesc.de.pl.in b/scripts/w3mhelp-funcdesc.de.pl.
</span> new file mode 100644
index 0000000..11539d1
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mhelp-funcdesc.de.pl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mhelp-funcdesc.de.pl.in
</span> @@ -0,0 +1,66 @@
+# charset
+$charset = 'UTF-8';
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27899,7 +28156,7 @@ index 0000000..11539d1
</span> diff --git a/scripts/w3mhelp-funcdesc.en.pl.in b/scripts/w3mhelp-funcdesc.en.pl.in
index d854b59..b9f4ed8 100644
--- a/scripts/w3mhelp-funcdesc.en.pl.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mhelp-funcdesc.en.pl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mhelp-funcdesc.en.pl.in
</span> @@ -4,44 +4,44 @@ $charset = 'US-ASCII';
# Buffer selection mode
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27971,7 +28228,7 @@ index d854b59..b9f4ed8 100644
</span> diff --git a/scripts/w3mhelp-funcdesc.ja.pl.in b/scripts/w3mhelp-funcdesc.ja.pl.in
index 051c888..4ef476e 100644
--- a/scripts/w3mhelp-funcdesc.ja.pl.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mhelp-funcdesc.ja.pl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mhelp-funcdesc.ja.pl.in
</span> @@ -46,21 +46,21 @@ $charset = 'EUC-JP';
);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28010,9 +28267,9 @@ index 051c888..4ef476e 100644
</span>
1;
diff --git a/scripts/w3mhelp.cgi.in b/scripts/w3mhelp.cgi.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b2fca8f..503dddc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b2fca8f..348d5df 100644
</span> --- a/scripts/w3mhelp.cgi.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mhelp.cgi.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mhelp.cgi.in
</span> @@ -48,7 +48,7 @@ if (defined($ENV{'QUERY_STRING'})) {
}
# print "tlang=$tlang\n";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28078,9 +28335,11 @@ index b2fca8f..503dddc 100644
</span> pipeBuf"));
-&show_keymap("Buffer operation",
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- split(" ", "backBf nextBf prevBf selMn selBuf vwSrc svSrc svBuf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- editBf editScr reload reshape rdrwSc dispI stopI"));
</span> +&show_keymap('Buffer Operations',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- split(" ", "backBf nextBf prevBf selMn selBuf vwSrc svSrc svBuf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- editBf editScr reload reshape rdrwSc dispI stopI"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ split(" ", "backBf nextBf prevBf goHome selMn selBuf vwSrc svSrc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svBuf editBf editScr reload reshape rdrwSc dispI stopI"));
</span>
-&show_keymap("Tab operation",
+&show_keymap('Tab Operations',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28137,7 +28396,7 @@ index b2fca8f..503dddc 100644
</span> diff --git a/scripts/w3mman/Makefile.in b/scripts/w3mman/Makefile.in
index 569e2fc..ad1cffe 100644
--- a/scripts/w3mman/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mman/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mman/Makefile.in
</span> @@ -33,11 +33,13 @@ ETC_DIR = $(sysconfdir)
CONF_DIR = $(sysconfdir)/$(PACKAGE)
BIN_DIR = $(bindir)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28198,7 +28457,7 @@ index 569e2fc..ad1cffe 100644
</span> diff --git a/scripts/w3mman/w3mman.1.in b/scripts/w3mman/w3mman.1.in
index 1c0361d..68e3afc 100644
--- a/scripts/w3mman/w3mman.1.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mman/w3mman.1.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mman/w3mman.1.in
</span> @@ -1,4 +1,4 @@
-.TH W3MMAN 1 "Nov 5, 2005"
+.TH W3MMAN 1 "2016-07-13"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28285,7 +28544,7 @@ diff --git a/scripts/w3mman/w3mman.de.1.in b/scripts/w3mman/w3mman.de.1.in
</span> new file mode 100644
index 0000000..d6c5a44
--- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mman/w3mman.de.1.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mman/w3mman.de.1.in
</span> @@ -0,0 +1,71 @@
+.\"*******************************************************************
+.\"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28361,7 +28620,7 @@ index 0000000..d6c5a44
</span> diff --git a/scripts/w3mman/w3mman.in b/scripts/w3mman/w3mman.in
index 6a27e70..fae7a41 100644
--- a/scripts/w3mman/w3mman.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mman/w3mman.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mman/w3mman.in
</span> @@ -7,7 +7,7 @@ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
sub usage {
($_ = $0) =~ s@.*/@@;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28399,7 +28658,7 @@ index 6a27e70..fae7a41 100644
</span> diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in
index f430307..d660681 100644
--- a/scripts/w3mman/w3mman2html.cgi.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/w3mman/w3mman2html.cgi.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/w3mman/w3mman2html.cgi.in
</span> @@ -23,18 +23,23 @@ if ((! $query{"man"}) && (! $query{"local"})) {
if ($query{"keyword"}) {
$keyword = $query{"keyword"};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28482,7 +28741,7 @@ index f430307..d660681 100644
</span> diff --git a/symbol.c b/symbol.c
index 50475ae..c047c56 100644
--- a/symbol.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ symbol.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/symbol.c
</span> @@ -176,10 +176,10 @@ push_symbol(Str str, char symbol, int width, int n)
#ifdef USE_M17N
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28499,7 +28758,7 @@ index 50475ae..c047c56 100644
</span> diff --git a/table.c b/table.c
index e1243ff..eb5c9ba 100644
--- a/table.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ table.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/table.c
</span> @@ -188,7 +188,7 @@ dv2sv(double *dv, short *iv, int size)
indexarray = NewAtom_N(short, size);
edv = NewAtom_N(double, size);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28702,7 +28961,7 @@ index e1243ff..eb5c9ba 100644
</span> diff --git a/table.h b/table.h
index 83b661f..fdcdef3 100644
--- a/table.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ table.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/table.h
</span> @@ -17,7 +17,7 @@
#define MAX_TABLE_N 20 /* maximum number of table in same level */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28715,7 +28974,7 @@ index 83b661f..fdcdef3 100644
</span> diff --git a/tagtable.tab b/tagtable.tab
index f9b7b76..f5a2c30 100644
--- a/tagtable.tab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tagtable.tab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tagtable.tab
</span> @@ -176,6 +176,7 @@ bdo HTML_BDO
big HTML_BIG
/big HTML_N_BIG
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28727,7 +28986,7 @@ index f9b7b76..f5a2c30 100644
</span> diff --git a/terms.c b/terms.c
index 7a3c987..a636ac0 100644
--- a/terms.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ terms.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/terms.c
</span> @@ -12,6 +12,7 @@
#include <unistd.h>
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29103,9 +29362,9 @@ index 7a3c987..a636ac0 100644
</span> #define CYGWIN_OFF {fputs("\033[?1000l",ttyf); flush_tty();}
diff --git a/url.c b/url.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed6062e..1c17e18 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed6062e..a9e4108 100644
</span> --- a/url.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ url.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/url.c
</span> @@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = {
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29135,14 +29394,24 @@ index ed6062e..1c17e18 100644
</span> option = SSL_OP_ALL;
if (ssl_forbid_method) {
if (strchr(ssl_forbid_method, '2'))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,8 +342,20 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,8 +342,30 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span> option |= SSL_OP_NO_TLSv1;
if (strchr(ssl_forbid_method, 'T'))
option |= SSL_OP_NO_TLSv1;
+ if (strchr(ssl_forbid_method, '4'))
+ option |= SSL_OP_NO_TLSv1;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SSL_OP_NO_TLSv1_1
</span> + if (strchr(ssl_forbid_method, '5'))
+ option |= SSL_OP_NO_TLSv1_1;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SSL_OP_NO_TLSv1_2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strchr(ssl_forbid_method, '6'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ option |= SSL_OP_NO_TLSv1_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SSL_OP_NO_TLSv1_3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strchr(ssl_forbid_method, '7'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ option |= SSL_OP_NO_TLSv1_3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> }
+#ifdef SSL_OP_NO_COMPRESSION
+ option |= SSL_OP_NO_COMPRESSION;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29156,7 +29425,7 @@ index ed6062e..1c17e18 100644
</span> #ifdef USE_SSL_VERIFY
/* derived from openssl-0.9.5/apps/s_{client,cb}.c */
#if 1 /* use SSL_get_verify_result() to verify cert */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,6 +462,8 @@ baseURL(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,6 +472,8 @@ baseURL(Buffer *buf)
</span> /* <BASE> tag is defined in the document */
return buf->baseURL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29165,7 +29434,7 @@ index ed6062e..1c17e18 100644
</span> else
return &buf->currentURL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -638,16 +658,21 @@ openSocket(char *const hostname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -638,16 +668,21 @@ openSocket(char *const hostname,
</span> #define COPYPATH_SPC_ALLOW 0
#define COPYPATH_SPC_IGNORE 1
#define COPYPATH_SPC_REPLACE 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29191,7 +29460,7 @@ index ed6062e..1c17e18 100644
</span> break;
case COPYPATH_SPC_IGNORE:
/* do nothing */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -658,7 +683,7 @@ copyPath(char *orgpath, int length, int option)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -658,7 +693,7 @@ copyPath(char *orgpath, int length, int option)
</span> }
}
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29200,7 +29469,7 @@ index ed6062e..1c17e18 100644
</span> orgpath++;
length--;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -668,22 +693,14 @@ copyPath(char *orgpath, int length, int option)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -668,22 +703,14 @@ copyPath(char *orgpath, int length, int option)
</span> void
parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29225,7 +29494,7 @@ index ed6062e..1c17e18 100644
</span>
/* RFC1808: Relative Uniform Resource Locators
* 4. Resolving Relative URLs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,7 +711,7 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,7 +721,7 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> goto do_label;
}
#if defined( __EMX__ ) || defined( __CYGWIN__ )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29234,7 +29503,7 @@ index ed6062e..1c17e18 100644
</span> p_url->scheme = SCM_LOCAL;
p += 17 - 1;
url += 17 - 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -802,19 +819,20 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -802,19 +829,20 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> /* scheme://user:pass@host or
* scheme://host:port
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29259,7 +29528,7 @@ index ed6062e..1c17e18 100644
</span> tmp = Strnew_charp_n(q, p - q);
p_url->port = atoi(tmp->ptr);
/* *p is one of ['\0', '/', '?', '#'] */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -822,15 +840,19 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -822,15 +850,19 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> case '@':
/* scheme://user@... */
p_url->user = copyPath(q, p - q, COPYPATH_SPC_IGNORE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29282,7 +29551,7 @@ index ed6062e..1c17e18 100644
</span> break;
}
analyze_file:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -956,12 +978,16 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -956,12 +988,16 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> p_url->label = NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29301,7 +29570,7 @@ index ed6062e..1c17e18 100644
</span> p->scheme = q->scheme;
p->port = q->port;
p->is_nocache = q->is_nocache;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1279,10 +1305,24 @@ getURLScheme(char **url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1279,17 +1315,36 @@ getURLScheme(char **url)
</span> return scheme;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29323,10 +29592,28 @@ index ed6062e..1c17e18 100644
</span> Str s = Strnew();
+ const int *no_referer_ptr;
+ int no_referer;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char* url_user_agent = query_SCONF_USER_AGENT(target);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Strcat_charp(s, "User-Agent: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (UserAgent == NULL || *UserAgent == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Strcat_charp(s, w3m_version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Strcat_charp(s, UserAgent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Strcat_charp(s, "\r\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!override_user_agent) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strcat_charp(s, "User-Agent: ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (url_user_agent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strcat_charp(s, url_user_agent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (UserAgent == NULL || *UserAgent == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strcat_charp(s, w3m_version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strcat_charp(s, UserAgent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strcat_charp(s, "\r\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Strcat_charp(s, "User-Agent: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (UserAgent == NULL || *UserAgent == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,7 +1346,12 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Strcat_m_charp(s, "Accept: ", AcceptMedia, "\r\n", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Strcat_m_charp(s, "Accept-Encoding: ", AcceptEncoding, "\r\n", NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,7 +1361,12 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span> Strcat_charp(s, "Pragma: no-cache\r\n");
Strcat_charp(s, "Cache-control: no-cache\r\n");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29340,7 +29627,7 @@ index ed6062e..1c17e18 100644
</span> #ifdef USE_SSL
if (current && current->scheme == SCM_HTTPS && target->scheme != SCM_HTTPS) {
/* Don't send Referer: if https:// -> http:// */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1314,6 +1359,7 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1314,6 +1374,7 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span> else
#endif
if (referer == NULL && current && current->scheme != SCM_LOCAL &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29348,7 +29635,7 @@ index ed6062e..1c17e18 100644
</span> (current->scheme != SCM_FTP ||
(current->user == NULL && current->pass == NULL))) {
char *p = current->label;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1384,7 +1430,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1384,7 +1445,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> {
Str tmp;
TextListItem *i;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29356,7 +29643,7 @@ index ed6062e..1c17e18 100644
</span> #ifdef USE_COOKIE
Str cookie;
#endif /* USE_COOKIE */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1400,7 +1445,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1400,7 +1460,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> for (i = extra->first; i != NULL; i = i->next) {
if (strncasecmp(i->ptr, "Authorization:",
sizeof("Authorization:") - 1) == 0) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29364,7 +29651,7 @@ index ed6062e..1c17e18 100644
</span> #ifdef USE_SSL
if (hr->command == HR_COMMAND_CONNECT)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1430,20 +1474,20 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1430,20 +1489,20 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> #endif /* USE_COOKIE */
if (hr->command == HR_COMMAND_POST) {
if (hr->request->enctype == FORM_ENCTYPE_MULTIPART) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29389,7 +29676,7 @@ index ed6062e..1c17e18 100644
</span> if (header_string)
Strcat(tmp, header_string);
Strcat_charp(tmp, "\r\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1603,7 +1647,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1603,7 +1662,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> pu->host != NULL && !check_no_proxy(pu->host)) {
hr->flag |= HR_FLAG_PROXY;
sock = openSocket(FTP_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29398,7 +29685,7 @@ index ed6062e..1c17e18 100644
</span> FTP_proxy_parsed.port);
if (sock < 0)
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1645,15 +1689,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1645,15 +1704,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> }
else if (pu->scheme == SCM_HTTPS) {
sock = openSocket(HTTPS_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29418,7 +29705,7 @@ index ed6062e..1c17e18 100644
</span> #ifdef USE_SSL
sslh = NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1685,8 +1729,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1685,8 +1744,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> }
}
else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29428,7 +29715,7 @@ index ed6062e..1c17e18 100644
</span> if (sock < 0) {
*status = HTST_MISSING;
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1713,6 +1756,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1713,6 +1771,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> write(sock, tmp->ptr, tmp->length);
if(w3m_reqlog){
FILE *ff = fopen(w3m_reqlog, "a");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29437,7 +29724,7 @@ index ed6062e..1c17e18 100644
</span> if (sslh)
fputs("HTTPS: request via SSL\n", ff);
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1735,6 +1780,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1735,6 +1795,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> write(sock, tmp->ptr, tmp->length);
if(w3m_reqlog){
FILE *ff = fopen(w3m_reqlog, "a");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29446,7 +29733,7 @@ index ed6062e..1c17e18 100644
</span> fwrite(tmp->ptr, sizeof(char), tmp->length, ff);
fclose(ff);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1750,7 +1797,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1750,7 +1812,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> pu->host != NULL && !check_no_proxy(pu->host)) {
hr->flag |= HR_FLAG_PROXY;
sock = openSocket(GOPHER_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29455,7 +29742,7 @@ index ed6062e..1c17e18 100644
</span> GOPHER_proxy_parsed.port);
if (sock < 0)
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1758,8 +1805,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1758,8 +1820,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> tmp = HTTPrequest(pu, current, hr, extra_header);
}
else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29465,7 +29752,7 @@ index ed6062e..1c17e18 100644
</span> if (sock < 0)
return uf;
if (pu->file == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2049,7 +2095,7 @@ filename_extension(char *path, int is_url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2049,7 +2110,7 @@ filename_extension(char *path, int is_url)
</span> break;
}
if (*last_dot == '.') {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29474,7 +29761,7 @@ index ed6062e..1c17e18 100644
</span> if (is_url && !IS_ALNUM(last_dot[i]))
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2234,3 +2280,66 @@ schemeToProxy(int scheme)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2234,3 +2295,66 @@ schemeToProxy(int scheme)
</span> }
return pu;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29544,7 +29831,7 @@ index ed6062e..1c17e18 100644
</span> diff --git a/version.c.in b/version.c.in
index 31d30e4..ab25163 100644
--- a/version.c.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ version.c.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/version.c.in
</span> @@ -1,5 +1,5 @@
/* $Id: version.c.in,v 1.49 2012/05/22 09:45:56 inu Exp $ */
-#define CURRENT_VERSION "w3m/0.5.3+cvs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29555,7 +29842,7 @@ index 31d30e4..ab25163 100644
</span> diff --git a/w3m-doc/install.html.in b/w3m-doc/install.html.in
index 8e27f03..610e4be 100644
--- a/w3m-doc/install.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3m-doc/install.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3m-doc/install.html.in
</span> @@ -232,7 +232,7 @@
<DT>DICT
<DD><B>$B<-=q0z$-5!G=(B</B>$B$rM-8z$K$7$^$9!#(B<BR>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29568,7 +29855,7 @@ index 8e27f03..610e4be 100644
</span> diff --git a/w3m-doc/outline.html.in b/w3m-doc/outline.html.in
index 60bda47..4ed2a59 100644
--- a/w3m-doc/outline.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3m-doc/outline.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3m-doc/outline.html.in
</span> @@ -146,8 +146,8 @@ w3m $B$N(Bmake$B;~$K;XDj$7$?%-!<A`:n$K$h$C$F!"%X%k%W%U%!%$%k$,0[$J$j$^$9!#(B
<TR> <TD>c</TD> <TD>$B8=%Z!<%8$N(B URL $B$rI=<((B</TD></TR>
<TR> <TD>=</TD> <TD>$B8=%I%-%e%a%s%H$N>pJs$rI=<((B</TD></TR>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29594,7 +29881,7 @@ index 60bda47..4ed2a59 100644
</span> diff --git a/w3m-doc/sample/keymap.cgi b/w3m-doc/sample/keymap.cgi
index f68f5fb..d92c60f 100755
--- a/w3m-doc/sample/keymap.cgi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3m-doc/sample/keymap.cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3m-doc/sample/keymap.cgi
</span> @@ -203,7 +203,6 @@ GOTO_LINK
HELP
HISTORY
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29606,7 +29893,7 @@ index f68f5fb..d92c60f 100755
</span> diff --git a/w3mbookmark.c b/w3mbookmark.c
index 4355536..a306f26 100644
--- a/w3mbookmark.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mbookmark.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mbookmark.c
</span> @@ -79,6 +79,7 @@ print_bookmark_panel(char *bmark, char *url, char *title, char *charset)
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29639,7 +29926,7 @@ index 4355536..a306f26 100644
</span> diff --git a/w3mhelp-lynx_en.html.in b/w3mhelp-lynx_en.html.in
index 7448877..d073b0f 100644
--- a/w3mhelp-lynx_en.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mhelp-lynx_en.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mhelp-lynx_en.html.in
</span> @@ -43,20 +43,20 @@ w3m</A>
<table cellpadding=0>
<TR><TD WIDTH=100>RET, C-f, Right arrow<TD>Follow hyperlink
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29691,7 +29978,7 @@ index 7448877..d073b0f 100644
</span> diff --git a/w3mhelp-lynx_ja.html.in b/w3mhelp-lynx_ja.html.in
index d160984..828b5a3 100644
--- a/w3mhelp-lynx_ja.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mhelp-lynx_ja.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mhelp-lynx_ja.html.in
</span> @@ -58,9 +58,9 @@
<TR><TD>F<TD><FRAMESET>��ޤ�ʸ���ɽ�����Ƥ���Ȥ��ˡ�<FRAME>
�����λؤ�ʣ���ʸ���1�Ĥ�ʸ����Ѵ�����ɽ�����ޤ���
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29707,7 +29994,7 @@ index d160984..828b5a3 100644
</span> diff --git a/w3mhelp-w3m_en.html.in b/w3mhelp-w3m_en.html.in
index eb46e8a..a692142 100644
--- a/w3mhelp-w3m_en.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mhelp-w3m_en.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mhelp-w3m_en.html.in
</span> @@ -47,21 +47,21 @@ w3m</A>
<table cellpadding=0>
<TR><TD WIDTH=100>RET<TD>Follow hyperlink
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29760,7 +30047,7 @@ index eb46e8a..a692142 100644
</span> diff --git a/w3mhelp-w3m_ja.html.in b/w3mhelp-w3m_ja.html.in
index 95464ab..72cb849 100644
--- a/w3mhelp-w3m_ja.html.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mhelp-w3m_ja.html.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mhelp-w3m_ja.html.in
</span> @@ -61,8 +61,8 @@
<TR> <TD>C-g</TD> <TD>�ڡ�����Ǥθ��߰��֤�ɽ��</TD></TR>
<TR> <TD>C-h</TD> <TD>URL�����ɽ��</TD></TR>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29775,7 +30062,7 @@ index 95464ab..72cb849 100644
</span> diff --git a/w3mhelperpanel.c b/w3mhelperpanel.c
index 110794b..96b60a0 100644
--- a/w3mhelperpanel.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mhelperpanel.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mhelperpanel.c
</span> @@ -115,6 +115,7 @@ printMailcapPanel(char *mailcap)
printf("</table>\n<input type=submit name=submit value=\"%s\">\n</form>\n\
</body>\n</html>\n",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29787,7 +30074,7 @@ index 110794b..96b60a0 100644
</span> diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
index dfc550c..8e2ad73 100644
--- a/w3mimg/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/Makefile.in
</span> @@ -16,9 +16,9 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@
IMGOBJS=@IMGOBJS@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29803,7 +30090,7 @@ index dfc550c..8e2ad73 100644
</span> diff --git a/w3mimg/fb/fb.c b/w3mimg/fb/fb.c
index cd11128..7960584 100644
--- a/w3mimg/fb/fb.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/fb/fb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/fb/fb.c
</span> @@ -12,12 +12,24 @@
#include <errno.h>
#include <sys/ioctl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30570,7 +30857,7 @@ index cd11128..7960584 100644
</span> diff --git a/w3mimg/fb/fb.h b/w3mimg/fb/fb.h
index 1138bb0..5d86454 100644
--- a/w3mimg/fb/fb.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/fb/fb.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/fb/fb.h
</span> @@ -1,7 +1,11 @@
/* $Id: fb.h,v 1.7 2003/07/07 15:48:17 ukai Exp $ */
#ifndef fb_header
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30586,7 +30873,7 @@ index 1138bb0..5d86454 100644
</span> diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
index 36e3b62..f1e8d97 100644
--- a/w3mimg/fb/fb_gdkpixbuf.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/fb/fb_gdkpixbuf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/fb/fb_gdkpixbuf.c
</span> @@ -6,7 +6,7 @@
#include "config.h"
#if defined(USE_GTK2)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30599,7 +30886,7 @@ index 36e3b62..f1e8d97 100644
</span> diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
index ea36637..1a5151c 100644
--- a/w3mimg/fb/fb_imlib2.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/fb/fb_imlib2.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/fb/fb_imlib2.c
</span> @@ -3,7 +3,6 @@
fb_imlib2.c 0.3 Copyright (C) 2002, hito
**************************************************************************/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30611,7 +30898,7 @@ index ea36637..1a5151c 100644
</span> diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c
index d3ae5a9..62511f0 100644
--- a/w3mimg/fb/fb_w3mimg.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/fb/fb_w3mimg.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/fb/fb_w3mimg.c
</span> @@ -153,10 +153,15 @@ check_tty_console(char *tty)
return 0;
if (strncmp(tty, "/dev/", 5) == 0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30642,7 +30929,7 @@ index d3ae5a9..62511f0 100644
</span> diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
index f5be4a8..9a539de 100644
--- a/w3mimg/x11/x11_w3mimg.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimg/x11/x11_w3mimg.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimg/x11/x11_w3mimg.c
</span> @@ -14,7 +14,7 @@
#elif defined(USE_GDKPIXBUF)
#if defined(USE_GTK2)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30883,7 +31170,7 @@ index f5be4a8..9a539de 100644
</span> diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c
index 5486a47..ccfa373 100644
--- a/w3mimgdisplay.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ w3mimgdisplay.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/w3mimgdisplay.c
</span> @@ -281,6 +281,10 @@ DrawImage(char *buf, int redraw)
maxImage = n + 1;
imageBuf = (W3MImage *) realloc((void *)imageBuf,
</pre><pre style='margin:0'>
</pre>