Merged from [email protected] (patch 469)

Patches applied:

 * [email protected]/emacs--cvs-trunk--0--patch-469
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-372

28 files changed, 50 insertions, 50 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1d8c5e6c9b..372983221a 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 f76bee300a..225c272587 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 <[email protected]>.
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 8992b3f9e8..4dd6bb20a6 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 09878543d4..9db4a19080 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 4ad45d195f..bc323fbbbd 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 3cc4cbe5f3..b795e62704 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 f9185c21c0..f0e9ad8c1f 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 a06d29bfd1..2f273771a9 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 cee7eaa130..cf6c1ff334 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 a4b0a65147..6799045bde 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 0d4c40c52d..953a7d1525 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 f08cd72638..4ec1e50b83 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 38fce879c7..04468535e0 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 7a2f127ae6..05e0658e56 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 dafd8f8914..6c0816ed98 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 fbb5559fd8..d8e8c205b3 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 e4243a1bd6..f82bebd4f2 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 261a6b4161..c346ccd908 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 ([email protected])                         10-8-94
 */
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd9cae979..b1cb97dabd 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 adf80c544b..9a85ba3746 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 8954e1d536..5267ec97eb 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 8d924532b8..7bc7186c25 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 365050e958..2a7de0f2f1 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 42c92ff618..05864c2ad2 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 3af3276e81..120a510f00 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 0333bd7d71..0bbc6806d7 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 8f7c90cad5..d9d20b8525 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 9c513ac820..8e1722d43b 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"