Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

	po/fr.po (time stamps only)

NEWS

@@ -271,7 +271,6 @@ have already been considered.
   - (enhancement) Ctrl+characters don't trigger hotkeys in menus and
     dialogs.
   - (bitrot) Fix two warnings on Mac OS X.
-  - (enhancement) reduce warnings on gcc 4.2 snapshots
   * don't use cmp -b, which FreeBSD doesn't support.  This is commit
     7a5f699a88c5fc89c510854b04702c16c30ece5a in src/dom/test/ which
     is run only by "make test" rather than "make".
@@ -319,9 +318,19 @@ To be released as 0.11.4.
 * build bug 959: test in configure whether -lX11 works
 * build: update SpiderMonkey configure check Debian compatibility
 * build: use $(CPPFLAGS) rather than $(AM_CFLAGS)
+* build: disable GCC 4.2 warning about builtin_modules
 * minor build bug 960: fix errors in loadmsgcat.c if mmap() exists but
   munmap() doesn't
 
+//////////////////////////////////////////////////////////////////////
+The following changes should be removed from NEWS before ELinks 0.11.4
+is released.  They are currently listed here just to show that they
+have already been considered.
+
+* Fixed bugs that were not in previous versions:
+  - bug 975: fix int/size_t pointer type mismatch in Perl interface
+//////////////////////////////////////////////////////////////////////
+
 ELinks 0.11.3:
 --------------
 
@@ -349,8 +358,8 @@ Released on 2007-04-15.
 * major Gentoo bug 121247: fix segfaults in Ruby user scripting
 * major bug 908: don't write to freed memory when the user pushes a
   radio button
-* major bug 937: don't send the entire HTTPS request to a CONNECT
-  proxy
+* major bug 937, CVE-2007-5034: don't send the entire HTTPS request to
+  a CONNECT proxy
 * bug 899, Debian bug 403139: recognize >2GB files in FTP directory
   listing, if off_t is large enough
 * bug 942: encode/decode file names in FTP URLs, so they can contain

po/pl.po

@@ -9091,7 +9091,7 @@ msgstr "Błąd zapisu do pliku"
 #. name:
 #: src/viewer/timer.c:89
 msgid "Timer"
-msgstr "Czasomierz"
+msgstr "Stoper"
 
 #. name:
 #: src/viewer/viewer.c:25

src/scripting/perl/hooks.c

@@ -142,7 +142,7 @@ do_script_hook_pre_format_html(unsigned char *url, struct cache_entry *cached,
 	SPAGAIN;
 	if (count == 1) {
 		SV *new_html_sv = POPs;
-		int new_html_len;
+		STRLEN new_html_len;
 		unsigned char *new_html = SvPV(new_html_sv, new_html_len);
 
 		if (new_html) {