--- a/man/ChangeLog	Tue Feb 09 19:13:44 2010 -0600
+++ b/man/ChangeLog	Tue Feb 09 19:34:19 2010 -0600
@@ -5,6 +5,11 @@
 	DEC Alpha is hardly the only 64-bit processor any more.
 	Also, ERROR_CHECK_TYPECHECK is now ERROR_CHECK_TYPES.
 
+2010-02-08  Jerry James  <james@xemacs.org>
+
+	* emodules.texi: Relicense as GPL v2 or later, using J. Kean
+	Johnston's blanket permission for such relicensing of his works.
+
 2010-02-05  Ben Wing  <ben@xemacs.org>
 
 	* internals/internals.texi (A Summary of the Various XEmacs Modules):

--- a/man/emodules.texi	Tue Feb 09 19:13:44 2010 -0600
+++ b/man/emodules.texi	Tue Feb 09 19:34:19 2010 -0600
@@ -32,6 +32,8 @@
 @set emacs XEmacs
 @end ifclear
 
+@c TODO: Merge the info-only and TeX-only license text, since they are
+@c identical.
 @ifinfo
 This file documents the module loading technology of @value{emacs}.
 
@@ -41,35 +43,22 @@
 manual provided the copyright notice and this permission notice are
 preserved on all copies.
 
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
+This file is part of XEmacs.
 
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
 
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Foundation.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this
-one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU General Public License'' may be
-included in a translation approved by the Free Software Foundation
-instead of in the original English.
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.
 @end ifinfo
 
 @c Combine indices.
@@ -97,22 +86,22 @@
 Version 1.0 @*
 September, 1998.@*
 
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
 
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU General Public License'' is included
-exactly as in the original, and provided that the entire resulting
-derived work is distributed under the terms of a permission notice
-identical to this one.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU General Public License'' may be
-included in a translation approved by the Free Software Foundation
-instead of in the original English.
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.
 @end titlepage
 @page
 

--- a/src/ChangeLog	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/ChangeLog	Tue Feb 09 19:34:19 2010 -0600
@@ -341,6 +341,14 @@
 	GET_VOID_FROM_LISP to make sure the same value comes back that
 	was put in.
 
+2010-02-09  Vin Shelton  <acs@xemacs.org>
+
+	* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
+	Declare hfont at start of a code block.
+
+	* glyphs-eimage.c: Undefine and then redefine FAR around the jpeg
+	header.
+
 2010-02-08  Vin Shelton  <acs@xemacs.org>
 
 	* nt.c (open_unc_volume): lpRemoteName is an XELPTSTR.

--- a/src/glyphs-eimage.c	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/glyphs-eimage.c	Tue Feb 09 19:34:19 2010 -0600
@@ -120,8 +120,15 @@
 #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 #endif
 
+/* Yet more breakage... jmorecfg.h unconditionally defines FAR either as
+   "far" or as blank.  Windef.h unconditionally defines FAR as "far".
+   We'll avoid the compile warning by redefing FAR the way windows defines it,
+   after loading the JPEG headers. */
+#undef FAR
 #include <jpeglib.h>
 #include <jerror.h>
+#undef FAR
+#define FAR far
 
 END_C_DECLS
 

--- a/src/objects-msw.c	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/objects-msw.c	Tue Feb 09 19:34:19 2010 -0600
@@ -2097,7 +2097,7 @@
 	  UNGCPRO;
 	  return 0;
 	}
-    
+      
       if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET)
 	{
 	  SelectObject (hdc, hfont);

--- a/src/s/hpux11-shr.h	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/s/hpux11-shr.h	Tue Feb 09 19:34:19 2010 -0600
@@ -1,6 +1,24 @@
-/* Synched up with: FSF 19.31. */
+/* For building XEmacs under HPUX 11.0 with dynamic libraries.
+   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
 
-/* For building XEmacs under HPUX 11.0 with dynamic libraries. */
+XEmacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* Synched up with: FSF 19.31. */
 
 #define ORDINARY_LINK