Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 459-473)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 86-87)

   - Update from CVS

30 files changed, 58 insertions, 54 deletions

diff --git a/lib-src/COPYING b/lib-src/COPYING
index d60c31a97a5..3912109b5cd 100644
--- a/lib-src/COPYING
+++ b/lib-src/COPYING
@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ff62d4fc343..bd6949c799c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
 2005-06-13  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in ($(DOC)): Fix last change.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1d8c5e6c9ba..372983221a3 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -16,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 38eb96e076f..225c272587f 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 # USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
@@ -30,7 +30,7 @@ use Mail::Address;
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.5 $';
+my($version) = '$Revision$';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 8992b3f9e80..4dd6bb20a68 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -14,8 +14,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 09878543d44..9db4a190803 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    See also sorted-doc.c, which produces similar output
    but in texinfo format and sorted by function/variable name.  */
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 4ad45d195f6..bc323fbbbd8 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 90c0228f720..75fa9ebe8e7 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define NO_SHORTNAMES
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f9185c21c08..f0e9ad8c1f6 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  * For Emacs in SunView/Sun-Windows: (supported by Sun Unix v3.2 or greater)
diff --git a/lib-src/etags.c b/lib-src/etags.c
index a06d29bfd11..2f273771a96 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -16,7 +16,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 /*
  * Authors:
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index cee7eaa130e..cf6c1ff334d 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #define NO_SHORTNAMES
 #define _XOPEN_SOURCE 500       /* for cuserid */
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index a4b0a65147d..6799045bde8 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
diff --git a/lib-src/getopt.h b/lib-src/getopt.h
index 0d4c40c52d0..953a7d15252 100644
--- a/lib-src/getopt.h
+++ b/lib-src/getopt.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GETOPT_H
 
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index f08cd72638a..4ec1e50b830 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 38fce879c7a..04468535e02 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 
 # Extract entries from ChangeLogs matching specified criteria.
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7a2f127ae61..05e0658e566 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index dafd8f8914c..6c0816ed98a 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The arguments given to this program are all the C and Lisp source files
  of GNU Emacs.  .elc and .el and .c files are allowed.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index fbb5559fd80..d8e8c205b3b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -15,8 +15,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 #
 
 ALL           = make-docfile hexl ctags etags movemail ebrowse
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e4243a1bd66..f82bebd4f2b 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
    cause loss of mail* if you do it on a system that does not normally
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 261a6b41614..c346ccd908b 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd9cae9796..b1cb97dabda 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
 */
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index adf80c544b6..9a85ba3746c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES   /* Tell config not to load remap.h */
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 8954e1d5369..5267ec97eb4 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <stdio.h>
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 8d924532b87..7bc7186c259 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /**
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 365050e9584..2a7de0f2f11 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Arguments which are detectably either RCS masters (with names ending in ,v)
 # or Emacs version files  (with names of the form foo.~<number>~) are ignored.
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 42c92ff6187..05864c2ad26 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -69,8 +69,8 @@ Id='$Id$'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 Copyright='Copyright (C) 2004 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 3af3276e811..120a510f006 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    This version sorts the output by function name.  */
 
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 0333bd7d710..0bbc6806d71 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 8f7c90cad55..d9d20b8525d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This program is allows a game to securely and atomically update a
    score file.  It should be installed setuid, owned by an appropriate
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 9c513ac8200..8e1722d43ba 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -20,8 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 
 DIFF="diff"