13 files changed, 205 insertions, 11 deletions
diff --git a/CHANGES b/CHANGES
index 35ca1eed..158c8c3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,15 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2005-01-05 (2.8.6dev.11)
+* add presentation type for application/xml and text/xml mime types as per
+    http://www.w3.org/TR/xhtml-media-types/
+    http://www.w3.org/TR/2002/NOTE-xhtml-media-types-20020801
+  which states that they may be used, though application/xhtml+xml is the
+  preferred media type (Debian #184482) -TD
+* remove an extra free() introduced in fixes from dev.10 for leak-checking
+  (reports by Thorsten Glaser, FLWM) -TD
+
 2005-01-02 (2.8.6dev.10)
 * correct final sed command in help_files.sed which was not a basic regular
   expression, left some links ending with .gz.gz -TD
diff --git a/configure b/configure
index 7ff27dc9..f9257ffc 100755
--- a/configure
+++ b/configure
@@ -1221,7 +1221,7 @@ fi;
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.10
+VERSION=2.8.6dev.11
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
diff --git a/configure.in b/configure.in
index a3aa6e55..11d85e43 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6dev.10)
+AC_REVISION(2.8.6dev.11)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -37,7 +37,7 @@ AC_ARG_WITH(system-type,
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.10
+VERSION=2.8.6dev.11
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
diff --git a/lynx.cfg b/lynx.cfg
index 50f905db..1ab36a49 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.6dev.10"
+#PRCS LYNX_VERSION "2.8.6dev.11"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 02 Jan 2005 15:35:21 -0800"
+#PRCS LYNX_DATE "Wed, 05 Jan 2005 16:42:15 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 00000000..81690d02
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,99 @@
+1998-02-14  Karl Eichwalder  <ke@suse.de>
+
+	* no.po: Update.
+
+Sun May 25 19:19:51 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po: Update.
+
+Mon Apr 28 17:38:54 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* es.po: Update.
+
+Wed Mar 26 09:58:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po: Update.
+
+Sun Mar 23 18:28:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* sv.po: Update.
+
+Fri Feb 14 08:24:07 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* pl.po: Update.
+
+Sun Feb  2 18:42:04 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po es.po fr.po sv.po: Update.
+
+Sat Jan 11 16:51:45 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* nl.po: Update.
+
+Fri Jan 10 13:09:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* fr.po: Update.
+
+Wed Jan  8 08:53:41 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* no.po: Update.
+
+Tue Jan  7 18:34:57 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* es.po: Update.
+
+Sun Jan  5 09:58:47 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po fr.po: Updates.
+
+Sat Jan  4 17:49:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* es.po: Update.
+
+Thu Dec 12 18:58:01 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* it.po: Remove.
+
+Wed Dec 11 20:05:00 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* mailshar gnu-translation@prep.ai.mit.edu
+	hello-1.3.6/po/hello.pot.
+
+	* POTFILES.in: remove `src/getopt1.c'.
+
+	* de.po es.po fr.po ko.po nl.po no.po pl.po pt.po sl.po sv.po: new
+ 	files from alpha.gnu.ai.mit.edu:/gnu/po/maint/hello.
+
+Fri Mar 15 12:43:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* fr.po: New (version 1.3.2).
+
+Tue Mar 12 10:15:26 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* mailshar gnu-translation@prep.ai.mit.edu
+	hello-1.3.4/po/hello.pot.
+
+Fri Mar  8 20:40:50 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po: New.
+
+Tue Mar  5 09:58:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* de.po: New.  Reflect current version 1.3.2; now 1.3.3.
+
+Sun Mar  3 21:06:15 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* Makefile.in.in ($(PACKAGE).pot): Add POTFILES.
+
+	* POTFILES.in: remove `src/version.c'.
+
+Tue Dec 19 10:16:39 1995  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* POTFILES.in: Reflect, that source files now in ../src/.
+
+Fri Dec 15 11:59:51 1995  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* POTFILES.in: New file.  Lists `getopt.c', `getopt1.c',
+ 	`hello.c', and `version.c'.
+	
+
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 00000000..c8c5965d
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Date: 1998-08-22 16:12:20-0400\n"
+"From: Webmaster Jim <jspath@bcpl.net>\n"
+"Content-Type: text/plain; charset=\n"
+"Xgettext-Options: --default-domain=po/es\n"
+"Files: src/LYMain.c\n"
+
+#: src/LYMain.c:2502
+msgid "%s Version %s %s"
+msgstr "%s Versi�n %s"
+
+#: src/LYMain.c:2504
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "El copyright sostuvo al lado de la universidad de Kansas, de la CERN, y de otros contribuidores.\n"
+
+#: src/LYMain.c:2506
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "Distribuido bajo la licencia el p�blico en general de GNU.\n"
+
+#: src/LYMain.c:2508
+msgid ""
+"See http://lynx.browser.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"Vea http://lynx.browser.org/ y la ayuda en l�nea para m�s informaci�n.\n"
+"\n"
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 00000000..fbbed99e
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,11 @@
+msgid ""
+msgstr ""
+"Date: 1998-08-22 16:12:20-0400\n"
+"From: Webmaster Jim <jspath@bcpl.net>\n"
+"Content-Type: text/plain; charset=\n"
+"Xgettext-Options: --default-domain=po/ko\n"
+"Files: src/LYMain.c\n"
+
+#: src/LYMain.c:2502
+msgid "%s Version %s %s"
+msgstr ""
diff --git a/po/no.po b/po/no.po
new file mode 100644
index 00000000..e8f57e59
--- /dev/null
+++ b/po/no.po
@@ -0,0 +1,11 @@
+msgid ""
+msgstr ""
+"Date: 1998-08-22 16:12:20-0400\n"
+"From: Webmaster Jim <jspath@bcpl.net>\n"
+"Content-Type: text/plain; charset=\n"
+"Xgettext-Options: --default-domain=po/no\n"
+"Files: src/LYMain.c\n"
+
+#: src/LYMain.c:2502
+msgid "%s Version %s %s"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 00000000..a726ffd8
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,11 @@
+msgid ""
+msgstr ""
+"Date: 1998-08-22 16:12:20-0400\n"
+"From: Webmaster Jim <jspath@bcpl.net>\n"
+"Content-Type: text/plain; charset=\n"
+"Xgettext-Options: --default-domain=po/pl\n"
+"Files: src/LYMain.c\n"
+
+#: src/LYMain.c:2502
+msgid "%s Version %s %s"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 00000000..bc745513
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Date: 1998-08-22 16:12:20-0400\n"
+"From: Webmaster Jim <jspath@bcpl.net>\n"
+"Content-Type: text/plain; charset=\n"
+"Xgettext-Options: --default-domain=po/pt\n"
+"Files: src/LYMain.c\n"
+
+#: src/LYMain.c:2502
+msgid "%s Version %s %s"
+msgstr "%s Vers�o %s %s"
+
+#: src/LYMain.c:2504
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "O copyright prendeu pela universidade de Kansas, de CERN, e de outros contribuinte.\n"
+
+#: src/LYMain.c:2506
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "Distribu�do sob a licen�a do general p�blico de GNU.\n"
+
+#: src/LYMain.c:2508
+msgid ""
+"See http://lynx.browser.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"Veja http://lynx.browser.org / e a ajuda em linha para mais informa��o.\n"
+"\n"
diff --git a/src/GridText.c b/src/GridText.c
index acf4503e..d79f5b17 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -8860,10 +8860,7 @@ static void HText_AddHiddenLink(HText *text, TextAnchor *textanchor)
     if ((dest = HTAnchor_followLink(textanchor->anchor)) &&
 	(text->hiddenlinkflag != HIDDENLINKS_IGNORE ||
 	 HTList_isEmpty(text->hidden_links))) {
-	char *cp_freeme = NULL;
-
-	HTList_appendObject(text->hidden_links, cp_freeme = HTAnchor_address(dest));
-	FREE(cp_freeme);
+	HTList_appendObject(text->hidden_links, HTAnchor_address(dest));
     }
 
     return;
diff --git a/src/HTInit.c b/src/HTInit.c
index db684ad1..2b8770e1 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -116,6 +116,7 @@ void HTFormatInit(void)
     SET_INTERNL("application/html", "text/plain", HTMLToPlain, 0.5);
     SET_INTERNL("application/html", "www/present", HTMLPresent, 2.0);
     SET_INTERNL("application/xhtml+xml", "www/present", HTMLPresent, 2.0);
+    SET_INTERNL("application/xml", "www/present", HTMLPresent, 2.0);
     SET_INTERNL("application/html", "www/source", HTPlainPresent, 1.0);
     SET_INTERNL("application/x-wais-source", "www/source", HTPlainPresent, 1.0);
     SET_INTERNL("application/x-wais-source", "www/present", HTWSRCConvert, 2.0);
@@ -148,6 +149,7 @@ void HTFormatInit(void)
     SET_INTERNL("text/html", "text/x-c", HTMLToC, 0.5);
     SET_INTERNL("text/html", "text/plain", HTMLToPlain, 0.5);
     SET_INTERNL("text/html", "www/present", HTMLPresent, 1.0);
+    SET_INTERNL("text/xml", "www/present", HTMLPresent, 2.0);
 
     /*
      * These should override the default types as necessary.
diff --git a/userdefs.h b/userdefs.h
index a7c10de4..0cb58316 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6dev.10"
+#define LYNX_VERSION "2.8.6dev.11"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 02 Jan 2005 15:35:21 -0800"
+#define LYNX_DATE "Wed, 05 Jan 2005 16:42:15 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */