Mercurial > emacs

changeset 83332:6c13700d1c13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 469) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-469 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-372
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 05 Jul 2005 22:22:24 +0000
parents efa9e4606e7e (current diff) e055d02d8b97 (diff)
children 40c0ee282254
files configure.in etc/cs-survival.tex etc/fr-survival.tex etc/pl-refcard.tex etc/sk-survival.tex lib-src/b2m.pl lib-src/emacsclient.c lib-src/rcs2log lib-src/vcdiff lisp/ChangeLog lisp/Makefile.in lisp/allout.el lisp/bindings.el lisp/calendar/todo-mode.el lisp/cus-face.el lisp/double.el lisp/emacs-lisp/bytecomp.el lisp/emacs-lisp/cl-specs.el lisp/emacs-lisp/eldoc.el lisp/emulation/viper-init.el lisp/emulation/viper-util.el lisp/faces.el lisp/files.el lisp/font-lock.el lisp/forms.el lisp/frame.el lisp/help-fns.el lisp/international/encoded-kb.el lisp/international/iso-swed.el lisp/international/iso-transl.el lisp/international/mule-cmds.el lisp/international/mule.el lisp/loadup.el lisp/mail/metamail.el lisp/net/rlogin.el lisp/obsolete/iso-acc.el lisp/obsolete/rsz-mini.el lisp/progmodes/ada-mode.el lisp/progmodes/ada-prj.el lisp/progmodes/autoconf.el lisp/progmodes/delphi.el lisp/progmodes/gdb-ui.el lisp/progmodes/idlw-shell.el lisp/progmodes/idlw-toolbar.el lisp/progmodes/idlwave.el lisp/progmodes/tcl.el lisp/progmodes/vhdl-mode.el lisp/recentf.el lisp/server.el lisp/simple.el lisp/smerge-mode.el lisp/startup.el lisp/subr.el lisp/talk.el lisp/term/AT386.el lisp/term/internal.el lisp/term/iris-ansi.el lisp/term/mac-win.el lisp/term/news.el lisp/term/rxvt.el lisp/term/sun.el lisp/term/tvi970.el lisp/term/wyse50.el lisp/term/x-win.el lisp/term/xterm.el lisp/type-break.el lisp/url/url-about.el lisp/url/url-auth.el lisp/url/url-cache.el lisp/url/url-cid.el lisp/url/url-cookie.el lisp/url/url-dav.el lisp/url/url-dired.el lisp/url/url-expand.el lisp/url/url-file.el lisp/url/url-ftp.el lisp/url/url-gw.el lisp/url/url-handlers.el lisp/url/url-history.el lisp/url/url-http.el lisp/url/url-https.el lisp/url/url-imap.el lisp/url/url-irc.el lisp/url/url-ldap.el lisp/url/url-mailto.el lisp/url/url-methods.el lisp/url/url-misc.el lisp/url/url-news.el lisp/url/url-nfs.el lisp/url/url-ns.el lisp/url/url-parse.el lisp/url/url-privacy.el lisp/url/url-proxy.el lisp/url/url-util.el lisp/url/url-vars.el lisp/url/url.el lisp/url/vc-dav.el lisp/vc-cvs.el lisp/vc-hooks.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc.el lisp/version.el lisp/whitespace.el lisp/x-dnd.el lispref/ChangeLog mac/makefile.MPW man/mh-e.texi src/.gdbinit src/Makefile.in src/alloc.c src/buffer.c src/cm.c src/cm.h src/coding.c src/coding.h src/config.in src/data.c src/dispextern.h src/dispnew.c src/emacs.c src/fileio.c src/fontset.c src/frame.c src/frame.h src/fringe.c src/indent.c src/intervals.h src/keyboard.c src/keyboard.h src/keymap.c src/lisp.h src/lread.c src/macterm.c src/macterm.h src/minibuf.c src/msdos.c src/print.c src/process.c src/puresize.h src/scroll.c src/sysdep.c src/syssignal.h src/term.c src/termchar.h src/termhooks.h src/termopts.h src/w32inevt.c src/w32term.c src/w32term.h src/window.c src/window.h src/xdisp.c src/xfaces.c src/xfns.c src/xmenu.c src/xselect.c src/xsmfns.c src/xterm.c src/xterm.h
diffstat 1379 files changed, 6571 insertions(+), 6504 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 # make all	to compile and build Emacs.
 # make install	to install it.
--- a/admin/admin.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/admin.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/admin/alloc-colors.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/alloc-colors.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <X11/Xlib.h>
 #include <stdio.h>
--- a/admin/build-configs	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/build-configs	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 # Build Emacs in several different configurations.
 
--- a/admin/cus-test.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/cus-test.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/admin/diff-tar-files	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/diff-tar-files	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 if [ $# != 2 ]; then
     cat <<EOF
--- a/admin/make-emacs	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/make-emacs	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
--- a/admin/revdiff	Tue Jul 05 22:12:55 2005 +0000
+++ b/admin/revdiff	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 use File::Basename;
 
--- a/config.bat	Tue Jul 05 22:12:55 2005 +0000
+++ b/config.bat	Tue Jul 05 22:22:24 2005 +0000
@@ -18,8 +18,8 @@
 
 rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs; see the file COPYING.  If not, write to the
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem   Boston, MA 02111-1307, USA.
+rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+rem   Boston, MA 02110-1301, USA.
 rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem
--- a/config.guess	Tue Jul 05 22:12:55 2005 +0000
+++ b/config.guess	Tue Jul 05 22:22:24 2005 +0000
@@ -17,7 +17,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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
--- a/config.sub	Tue Jul 05 22:12:55 2005 +0000
+++ b/config.sub	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,8 @@
 #
 # 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 Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
--- a/configure.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/configure.in	Tue Jul 05 22:22:24 2005 +0000
@@ -20,8 +20,8 @@
 dnl
 dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
-dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl  Boston, MA 02111-1307, USA.
+dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl  Boston, MA 02110-1301, USA.
 
 AC_PREREQ(2.54)dnl
 AC_INIT(src/lisp.h)
@@ -2813,8 +2813,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.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code
--- a/etc/INTERVIEW	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/INTERVIEW	Tue Jul 05 22:22:24 2005 +0000
@@ -412,13 +412,12 @@
 Stallman: Write to the Free Software Foundation, 675 Massachusetts Ave.,
 Cambridge, MA 02139.
 
-[In June 1995, this address changed to:
+[As of April 2005, this address is:
      Free Software Foundation
-     59 Temple Place - Suite 330
-     Boston, MA  02111-1307,  USA
+     51 Franklin Street, Fifth Floor
+     Boston, MA  02110-1301, USA
      Voice:  +1-617-542-5942
      Fax:    +1-617-542-2652
--gnu@prep.ai.mit.edu
 ]
 
 BYTE: What are you going to do when you are done with the GNU system?
--- a/etc/calccard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/calccard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -29,7 +29,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+% the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -77,7 +78,8 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs Calc manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/cs-dired-ref.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/cs-dired-ref.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -66,7 +66,8 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/cs-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/cs-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -27,8 +27,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -82,7 +82,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/cs-survival.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/cs-survival.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -37,8 +37,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.
 
 % Czech hyphenation rules applied
 \chyph
--- a/etc/de-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/de-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/dired-ref.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/dired-ref.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -59,7 +59,8 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/edt-user.doc	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/edt-user.doc	Tue Jul 05 22:22:24 2005 +0000
@@ -20,7 +20,7 @@
 
 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.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ============================================================================
 
@@ -840,8 +840,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.
 
 ;;; Commentary:
 
--- a/etc/emacs.1	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/emacs.1	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.
 .\"
 '\" t
 .TH EMACS 1 "2001 November 23"
--- a/etc/emacs.py	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/emacs.py	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 import os, sys, traceback, inspect, rlcompleter, __main__
 
--- a/etc/fr-drdref.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/fr-drdref.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -61,7 +61,7 @@
 sur toutes les copies.
 
 Pour obtenir des copies du manuel de GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/fr-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/fr-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -71,7 +71,7 @@
 toutes les copies.
 
 Pour les copies du manuel GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/fr-survival.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/fr-survival.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -38,8 +38,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.
 
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
--- a/etc/gfdl.1	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/gfdl.1	Tue Jul 05 22:22:24 2005 +0000
@@ -12,7 +12,7 @@
 .if t \(co
 .if n (c)
 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, 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.
--- a/etc/gnus-tut.txt	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/gnus-tut.txt	Tue Jul 05 22:22:24 2005 +0000
@@ -43,8 +43,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.
 
 From lars Thu Feb 23 23:20:38 1995
 From: larsi@ifi.uio.no (ding)
--- a/etc/orgcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/orgcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -32,8 +32,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/pl-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/pl-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -48,8 +48,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -92,7 +92,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/ps-prin0.ps	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/ps-prin0.ps	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
--- a/etc/ps-prin1.ps	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/ps-prin1.ps	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
--- a/etc/refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -30,8 +30,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -80,7 +80,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/ru-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/ru-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -35,7 +35,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/sk-dired-ref.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/sk-dired-ref.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -67,7 +67,8 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/sk-refcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/sk-refcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -27,8 +27,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.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -84,7 +84,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 
--- a/etc/sk-survival.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/sk-survival.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -37,8 +37,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.
 
 % Slovak hyphenation rules applied
 \shyph
--- a/etc/survival.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/survival.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -41,8 +41,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.
 
 \def\versionnumber{1.0}
 \def\year{2000}
--- a/etc/vipcard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/vipcard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -73,7 +73,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 
--- a/etc/viperCard.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/etc/viperCard.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -81,7 +81,7 @@
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 
--- a/leim/MISC-DIC/CTLau-b5.html	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/MISC-DIC/CTLau-b5.html	Tue Jul 05 22:22:24 2005 +0000
@@ -24,7 +24,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.
 #
 #
 # File Format:
--- a/leim/MISC-DIC/CTLau.html	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/MISC-DIC/CTLau.html	Tue Jul 05 22:22:24 2005 +0000
@@ -24,7 +24,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.
 # 
 #
 # File Format:
--- a/leim/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
--- a/leim/SKK-DIC/SKK-JISYO.L	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/SKK-DIC/SKK-JISYO.L	Tue Jul 05 22:22:24 2005 +0000
@@ -21,7 +21,8 @@
 ;; 
 ;; You should have received a copy of the GNU General Public License
 ;; along with SKK, see the file COPYING.  If not, write to the Free
-;; Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 ;; 
 ;; okuri-ari entries.
 ¤òs /ÀË/
--- a/leim/ja-dic/ja-dic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/ja-dic/ja-dic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -34,7 +34,8 @@
 ;; 
 ;; You should have received a copy of the GNU General Public License
 ;; along with SKK, see the file COPYING.  If not, write to the Free
-;; Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 ;; 
 ;; okuri-ari entries.
 
--- a/leim/leim-ext.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/leim-ext.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/leim/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 srcdir=.
 
--- a/leim/quail/croatian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/croatian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/leim/quail/cyril-jis.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/cyril-jis.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/cyrillic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/cyrillic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/leim/quail/czech.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/czech.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/leim/quail/ethiopic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/ethiopic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
--- a/leim/quail/georgian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/georgian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/greek.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/greek.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hangul.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hangul.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hangul3.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hangul3.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hanja-jis.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hanja-jis.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hanja.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hanja.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hanja3.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hanja3.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/hebrew.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/hebrew.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/indian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/indian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/leim/quail/ipa.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/ipa.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/japanese.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/japanese.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/lao.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/lao.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/leim/quail/latin-alt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/latin-alt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
--- a/leim/quail/latin-ltx.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/latin-ltx.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/leim/quail/latin-post.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/latin-post.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
--- a/leim/quail/latin-pre.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/latin-pre.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/leim/quail/lrt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/lrt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/py-punct.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/py-punct.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/leim/quail/pypunct-b5.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/pypunct-b5.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
Binary file leim/quail/rfc1345.el has changed
--- a/leim/quail/sgml-input.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/sgml-input.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/sisheng.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/sisheng.el	Tue Jul 05 22:22:24 2005 +0000
@@ -18,7 +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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/leim/quail/slovak.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/slovak.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/leim/quail/symbol-ksc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/symbol-ksc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; 94.10.24   Written for Mule Ver.2.0 (koaunghi.un@zdv.uni-tuebingen.de)
 ;;; 94.11.04   Updated for Mule Ver.2.1 (koaunghi.un@zdv.uni-tuebingen.de)
--- a/leim/quail/thai.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/thai.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/leim/quail/tibetan.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/tibetan.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,7 +19,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
 
--- a/leim/quail/uni-input.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/uni-input.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/viqr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/viqr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/vntelex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/vntelex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/leim/quail/welsh.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/leim/quail/welsh.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lib-src/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
--- a/lib-src/b2m.pl	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/b2m.pl	Tue Jul 05 22:22:24 2005 +0000
@@ -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>.
--- a/lib-src/cvtmail.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/cvtmail.c	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
--- a/lib-src/digest-doc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/digest-doc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
--- a/lib-src/ebrowse.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/ebrowse.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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>
--- a/lib-src/emacsclient.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/emacsclient.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #define NO_SHORTNAMES
--- a/lib-src/emacstool.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/emacstool.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+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)
--- a/lib-src/etags.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/etags.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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:
--- a/lib-src/fakemail.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/fakemail.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #define NO_SHORTNAMES
 #define _XOPEN_SOURCE 500	/* for cuserid */
--- a/lib-src/getopt.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/getopt.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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>.  */
--- a/lib-src/getopt.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/getopt.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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
 
--- a/lib-src/getopt1.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/getopt1.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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>
--- a/lib-src/grep-changelog	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/grep-changelog	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
--- a/lib-src/hexl.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/hexl.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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>
--- a/lib-src/make-docfile.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/make-docfile.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* 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.
--- a/lib-src/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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
--- a/lib-src/movemail.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/movemail.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* 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
--- a/lib-src/ntlib.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/ntlib.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */
--- a/lib-src/ntlib.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/ntlib.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 */
 
--- a/lib-src/pop.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/pop.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES	/* Tell config not to load remap.h */
--- a/lib-src/pop.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/pop.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <stdio.h>
 
--- a/lib-src/profile.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/profile.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /**
--- a/lib-src/rcs-checkin	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/rcs-checkin	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
--- a/lib-src/rcs2log	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/rcs2log	Tue Jul 05 22:22:24 2005 +0000
@@ -69,8 +69,8 @@
 #
 # 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.
--- a/lib-src/sorted-doc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/sorted-doc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
--- a/lib-src/test-distrib.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/test-distrib.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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>
--- a/lib-src/update-game-score.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/update-game-score.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+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
--- a/lib-src/vcdiff	Tue Jul 05 22:12:55 2005 +0000
+++ b/lib-src/vcdiff	Tue Jul 05 22:22:24 2005 +0000
@@ -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"
--- a/lisp/ChangeLog	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ChangeLog	Tue Jul 05 22:22:24 2005 +0000
@@ -1,17 +1,65 @@
+2005-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/lisp-mode.el (lisp-mode-variables): Prevent adaptive
+	filling from using prefix when filling a single-line docstring.
+
+	* progmodes/flymake.el: Remove useless eval-when-compile.
+
+	* arc-mode.el (archive-lzh-ogm): Reorder save excursion/restriction.
+
+2005-07-04  Richard M. Stallman  <rms@gnu.org>
+
+	* textmodes/org.el (org-file-apps-defaults-gnu):
+	Rename from org-file-apps-defaults-linux.
+	(org-default-apps): Don't test system-type for `linux'.
+	(org-file-apps): Doc fix.
+
+2005-07-04  David Ponce  <david@dponce.com>
+
+	* tree-widget.el: Improve header Commentary section.
+	(tree-widget) [defgroup]
+	(tree-widget-image-enable, tree-widget-themes-directory)
+	(tree-widget-theme, tree-widget-image-properties-emacs)
+	(tree-widget-image-properties-xemacs, tree-widget-create-image)
+	(tree-widget-image-formats, tree-widget-control)
+	(tree-widget-empty-control, tree-widget-leaf-control
+	(tree-widget-guide, tree-widget-end-guide, tree-widget-no-guide)
+	(tree-widget-handle, tree-widget-no-handle, tree-widget-p)
+	(tree-widget-keep, tree-widget-after-toggle-functions)
+	(tree-widget-open-node, tree-widget-close-node): Doc fix.
+	(tree-widget-open-control, tree-widget-close-control): Fix doc and
+	:help-echo message.
+	(tree-widget-set-theme): Doc fix.  Use `string-equal'.
+	(tree-widget-image-properties): Doc fix.  Clearer implementation.
+	(tree-widget--cursors): New constant.
+	(tree-widget-lookup-image): New function split from
+	`tree-widget-find-image'.  Clearer implementation.
+	(tree-widget-find-image): Use it.
+	(tree-widget-button-keymap): Use `set-keymap-parent'.
+	(tree-widget) [define-widget]: Use `widget-children-value-delete'.
+	Define the sub-widgets here.
+	(tree-widget-node): Check that :node is not a tree-widget.
+	(tree-widget-get-super, tree-widget-open-control)
+	(tree-widget-close-control, tree-widget-empty-control)
+	(tree-widget-leaf-control, tree-widget-guide)
+	(tree-widget-end-guide, tree-widget-no-guide, tree-widget-handle)
+	(tree-widget-no-handle, tree-widget-value-delete)
+	(tree-widget-map): Remove.
+	(tree-widget-children-value-save): Doc fix.  Simplified.
+	(tree-widget-value-create): Update according to previous changes.
+
 2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: Leading space replaced by TABS.
 	(org-recalc-marks, org-table-rotate-recalc-marks)
 	(org-table-get-specials): Treat "^" and "_" marks.
 	(org-table-justify-field-maybe): Optional argument NEW.
-	(org-table-eval-formula): Parsing of the format simplified.  New
-	modes C,I.  Honor the %= parameter in the current table.  Avoid
-	unnecessary re-align by using the NEW argument to
+	(org-table-eval-formula): Parsing of the format simplified.
+	New modes C,I.  Honor the %= parameter in the current table.
+	Avoid unnecessary re-align by using the NEW argument to
 	`org-table-justify-field-maybe'.
-	(org-calc-default-modes): Default for date-format mimicks
-	org-mode.
-	(org-agenda, org-timeline): Quote argument in
-	`org-agenda-redo-command'.
+	(org-calc-default-modes): Default for date-format mimicks org-mode.
+	(org-agenda, org-timeline): Quote argument in org-agenda-redo-command.
 
 2005-07-03  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -35,6 +83,12 @@
 
 2005-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
+	* progmodes/prolog.el (prolog-eof-string): Doc fixes.
+	(prolog-indent-level): Fix typo in docstring.
+
+	* info.el (Info-history, Info-history-forward)
+	(Info-history-list, Info-speedbar-fetch-file-nodes): Doc fixes.
+
 	* add-log.el (add-change-log-entry):
 	* comint.el (comint-dynamic-list-input-ring)
 	(comint-dynamic-list-completions):
@@ -184,7 +238,7 @@
 
 	* emulation/tpu-edt.el (tpu-emacs19-p): Var deleted.
 	All references simplified.
-	(tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p.  Uses changed.
+	(tpu-lucid-emacs-p): Rename from tpu-lucid-emacs19-p.  Uses changed.
 	(zmacs-regions): Add defvar.
 	(repeat-complex-command-map): Everything about that deleted.
 
@@ -205,7 +259,7 @@
 
 	* mail/rmailsum.el (rmail-summary-redo): Add defvar.
 	(rmail-summary-mode-map, rmail-summary-overlay): Defvars moved up.
-	(rmail-new-summary-line-count): Renamed from new-summary-line-count.
+	(rmail-new-summary-line-count): Rename from new-summary-line-count.
 	Add defvar.
 	(rmail-summary-beginning-of-message): Use with-no-warnings.
 	(rmail-summary-first-message, rmail-summary-last-message): Likewise.
--- a/lisp/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 SHELL = /bin/sh
 
--- a/lisp/abbrev.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/abbrev.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/abbrevlist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/abbrevlist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/add-log.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/add-log.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/align.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/align.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/allout.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/allout.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/ansi-color.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ansi-color.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/apropos.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/apropos.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/arc-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/arc-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
@@ -679,8 +679,6 @@
 
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)
-;; -------------------------------------------------------------------------
-;; Section: Key maps
 
 (let ((item1 '(archive-subfile-mode " Archive")))
   (or (member item1 minor-mode-alist)
@@ -1556,8 +1554,8 @@
 	(insert newhsize (archive-lzh-resum p newhsize))))))
 
 (defun archive-lzh-ogm (newval files errtxt ofs)
-  (save-restriction
-    (save-excursion
+  (save-excursion
+    (save-restriction
       (widen)
       (set-buffer-multibyte nil)
       (dolist (fil files)
--- a/lisp/array.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/array.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/autoarg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/autoarg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/autoinsert.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/autoinsert.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
@@ -198,8 +198,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.
 
 ;;; Commentary:
 
--- a/lisp/autorevert.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/autorevert.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/avoid.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/avoid.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/battery.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/battery.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/bindings.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/bindings.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/bookmark.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/bookmark.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/bs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/bs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/buff-menu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/buff-menu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/button.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/button.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/calculator.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calculator.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;;=====================================================================
 ;;; Commentary:
--- a/lisp/calendar/appt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/appt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-bahai.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-bahai.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-china.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-china.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-coptic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-coptic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-dst.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-dst.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-french.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-french.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-hebrew.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-hebrew.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-islam.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-islam.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-iso.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-iso.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-julian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-julian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-mayan.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-mayan.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-menu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-menu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-move.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-move.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-persia.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-persia.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-tex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-tex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/cal-x.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/cal-x.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/calendar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/calendar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/diary-lib.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/diary-lib.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/holidays.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/holidays.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/icalendar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/icalendar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/lunar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/lunar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/parse-time.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/parse-time.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/solar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/solar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/time-date.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/time-date.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/timeclock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/timeclock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/calendar/todo-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/calendar/todo-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; ---------------------------------------------------------------------------
 
--- a/lisp/case-table.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/case-table.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/cdl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cdl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/chistory.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/chistory.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/cmuscheme.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cmuscheme.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/comint.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/comint.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/compare-w.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/compare-w.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/complete.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/complete.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/completion.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/completion.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/composite.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/composite.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/cus-dep.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cus-dep.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/cus-edit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cus-edit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/cus-face.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cus-face.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/cus-start.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cus-start.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/cus-theme.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cus-theme.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/custom.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/custom.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/cvs-status.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/cvs-status.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/dabbrev.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dabbrev.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/delim-col.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/delim-col.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/delsel.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/delsel.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/descr-text.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/descr-text.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/desktop.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/desktop.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/diff-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/diff-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/diff.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/diff.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/dired-aux.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dired-aux.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/dired-x.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dired-x.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/dired.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dired.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/dirtrack.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dirtrack.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/disp-table.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/disp-table.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/dnd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dnd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/dos-fns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dos-fns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/dos-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dos-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/dos-w32.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/dos-w32.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/double.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/double.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/ebuff-menu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ebuff-menu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/echistory.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/echistory.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-diff.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-diff.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-help.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-help.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-hook.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-hook.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-init.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-init.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-merg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-merg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-mult.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-mult.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-ptch.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-ptch.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-vers.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-vers.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff-wind.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff-wind.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ediff.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ediff.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/edmacro.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/edmacro.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/ehelp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ehelp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/electric.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/electric.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/elide-head.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/elide-head.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/advice.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/advice.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; LCD Archive Entry:
 ;; advice|Hans Chalupsky|hans@cs.buffalo.edu|
--- a/lisp/emacs-lisp/assoc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/assoc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/authors.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/authors.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/autoload.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/autoload.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/backquote.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/backquote.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/benchmark.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/benchmark.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/bindat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/bindat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/byte-opt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/byte-opt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/byte-run.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/byte-run.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/bytecomp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/checkdoc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/checkdoc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/emacs-lisp/cl-compat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-compat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl-extra.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-extra.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl-indent.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-indent.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl-macs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-macs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl-seq.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-seq.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl-specs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl-specs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/copyright.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/copyright.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/crm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/crm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/cust-print.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/cust-print.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/debug.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/debug.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/derived.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/derived.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/disass.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/disass.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/easy-mmode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/easymenu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/easymenu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/edebug.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/edebug.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/eldoc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/eldoc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/elint.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/elint.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/elp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/elp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/emacs-lisp/ewoc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/ewoc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/find-func.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/find-func.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/emacs-lisp/find-gc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/find-gc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/float-sup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/float-sup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/generic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/generic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/gulp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/gulp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/helper.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/helper.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/levents.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/levents.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/lisp-mnt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lisp-mnt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/lisp-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
@@ -172,6 +172,10 @@
   (setq paragraph-ignore-fill-prefix t)
   (make-local-variable 'fill-paragraph-function)
   (setq fill-paragraph-function 'lisp-fill-paragraph)
+  ;; Adaptive fill mode gets the fill wrong for a one-line paragraph made of
+  ;; a single docstring.  Let's fix it here.
+  (set (make-local-variable 'adaptive-fill-function)
+       (lambda () (if (looking-at "\\s-+\"[^\n\"]+\"\\s-*$") "")))
   ;; Adaptive fill mode gets in the way of auto-fill,
   ;; and should make no difference for explicit fill
   ;; because lisp-fill-paragraph should do the job.
--- a/lisp/emacs-lisp/lisp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lisp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/lmenu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lmenu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/lselect.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lselect.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/lucid.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/lucid.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/macroexp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/macroexp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/emacs-lisp/map-ynp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/map-ynp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/pp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/pp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/re-builder.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/re-builder.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/regexp-opt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/regi.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/regi.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/ring.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/ring.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/rx.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/rx.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/shadow.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/shadow.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/sregex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/sregex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/syntax.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/syntax.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/tcover-ses.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/tcover-ses.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (require 'testcover)
 
--- a/lisp/emacs-lisp/tcover-unsafep.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/tcover-unsafep.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (require 'testcover)
 
--- a/lisp/emacs-lisp/testcover.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/testcover.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 
 ;;; Commentary:
--- a/lisp/emacs-lisp/timer.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/timer.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/tq.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/tq.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/trace.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/trace.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; LCD Archive Entry:
 ;; trace|Hans Chalupsky|hans@cs.buffalo.edu|
--- a/lisp/emacs-lisp/unsafep.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/unsafep.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lisp/warnings.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lisp/warnings.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emacs-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emacs-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/crisp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/crisp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/cua-base.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/cua-base.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 
 ;;; Commentary:
--- a/lisp/emulation/cua-gmrk.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/cua-gmrk.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/cua-rect.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/cua-rect.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Acknowledgements
 
--- a/lisp/emulation/edt-lk201.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/edt-lk201.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/edt-mapper.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/edt-mapper.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/emulation/edt-pc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/edt-pc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/edt-vt100.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/edt-vt100.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/edt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/edt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 
 
--- a/lisp/emulation/keypad.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/keypad.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/pc-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/pc-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/pc-select.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/pc-select.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/tpu-edt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/tpu-edt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; TPU-edt is based on tpu.el by Jeff Kowalski and Bob Covey.
 
--- a/lisp/emulation/tpu-extras.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/tpu-extras.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/tpu-mapper.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/tpu-mapper.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/vip.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/vip.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-cmd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-cmd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-ex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-ex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-init.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-init.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-keym.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-keym.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-macs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-macs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-mous.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-mous.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/viper.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/viper.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/emulation/ws-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/emulation/ws-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/env.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/env.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/eshell/em-alias.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-alias.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-alias)
 
--- a/lisp/eshell/em-banner.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-banner.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-banner)
 
--- a/lisp/eshell/em-basic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-basic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-basic)
 
--- a/lisp/eshell/em-cmpl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-cmpl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-cmpl)
 
--- a/lisp/eshell/em-dirs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-dirs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-dirs)
 
--- a/lisp/eshell/em-glob.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-glob.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/eshell/em-hist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-hist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-hist)
 
--- a/lisp/eshell/em-ls.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-ls.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-ls)
 
--- a/lisp/eshell/em-pred.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-pred.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-pred)
 
--- a/lisp/eshell/em-prompt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-prompt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-prompt)
 
--- a/lisp/eshell/em-rebind.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-rebind.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-rebind)
 
--- a/lisp/eshell/em-script.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-script.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-script)
 
--- a/lisp/eshell/em-smart.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-smart.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-smart)
 
--- a/lisp/eshell/em-term.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-term.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-term)
 
--- a/lisp/eshell/em-unix.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-unix.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-unix)
 
--- a/lisp/eshell/em-xtra.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/em-xtra.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'em-xtra)
 
--- a/lisp/eshell/esh-arg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-arg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-arg)
 
--- a/lisp/eshell/esh-cmd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-cmd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-cmd)
 
--- a/lisp/eshell/esh-ext.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-ext.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-ext)
 
--- a/lisp/eshell/esh-io.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-io.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-io)
 
--- a/lisp/eshell/esh-maint.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-maint.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/eshell/esh-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-mode)
 
--- a/lisp/eshell/esh-module.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-module.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 (provide 'esh-module)
 
--- a/lisp/eshell/esh-opt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-opt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-opt)
 
--- a/lisp/eshell/esh-proc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-proc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-proc)
 
--- a/lisp/eshell/esh-test.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-test.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-test)
 
--- a/lisp/eshell/esh-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-util)
 
--- a/lisp/eshell/esh-var.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/esh-var.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'esh-var)
 
--- a/lisp/eshell/eshell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/eshell/eshell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 (provide 'eshell)
 
@@ -86,8 +86,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with Eshell; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 ;;
 ;;;_* How to begin
 ;;
--- a/lisp/expand.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/expand.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/facemenu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/facemenu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/faces.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/faces.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ffap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ffap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 
 ;;; Commentary:
--- a/lisp/filecache.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/filecache.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/files.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/files.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/filesets.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/filesets.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,8 @@
 ;; GNU General Public License for more details.
 
 ;; A copy of the GNU General Public License can be obtained from this
-;; program's author or from the Free Software Foundation, Inc., 675 Mass
-;; Ave, Cambridge, MA 02139, USA.
+;; program's author or from the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 (defvar filesets-version "1.8.4")
 (defvar filesets-homepage
--- a/lisp/find-dired.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/find-dired.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/find-file.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/find-file.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/find-lisp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/find-lisp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/finder.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/finder.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/flow-ctrl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/flow-ctrl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/foldout.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/foldout.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/follow.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/follow.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/font-core.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/font-core.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/font-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/font-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/format.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/format.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/forms.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/forms.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/frame.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/frame.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/fringe.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/fringe.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/generic-x.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/generic-x.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/gnus/binhex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/binhex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/canlock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/canlock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -18,8 +18,8 @@
 
 ;; 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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/compface.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/compface.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/deuglify.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/deuglify.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/dig.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/dig.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/dns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/dns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/earcon.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/earcon.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;; This file provides access to sound effects in Gnus.
--- a/lisp/gnus/flow-fill.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/flow-fill.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/format-spec.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/format-spec.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-agent.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-agent.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-art.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-art.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-async.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-async.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-audio.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-audio.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-bcklg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-bcklg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-cache.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-cache.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-cite.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-cite.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-cus.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-cus.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-delay.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-delay.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-demon.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-demon.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-diary.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-diary.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,7 +22,8 @@
 
 ;; 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 
 ;;; Commentary:
--- a/lisp/gnus/gnus-dired.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-dired.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-draft.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-draft.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-dup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-dup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-eform.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-eform.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-ems.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-ems.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-fun.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-fun.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-gl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-gl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-group.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-group.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-int.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-int.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-kill.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-kill.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-logic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-logic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-mh.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-mh.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-ml.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-ml.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-mlspl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-mlspl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-move.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-move.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-msg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-msg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-nocem.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-nocem.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-picon.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-picon.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-range.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-range.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-registry.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-registry.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-salt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-salt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-score.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-score.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-setup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-setup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;; My head is starting to spin with all the different mail/news packages.
--- a/lisp/gnus/gnus-sieve.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-sieve.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-soup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-soup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-spec.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-spec.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-srvr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-srvr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-start.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-start.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-sum.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-sum.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-topic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-topic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-undo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-undo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-uu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-uu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-vm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-vm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus-win.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus-win.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/gnus.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/gnus.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/hex-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/hex-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/gnus/html2text.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/html2text.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/ietf-drums.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/ietf-drums.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/imap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/imap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mail-parse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mail-parse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mail-prsvr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mail-prsvr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mail-source.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mail-source.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mailcap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mailcap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/message.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/message.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/messcompat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/messcompat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-bodies.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-bodies.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-decode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-decode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-encode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-encode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-extern.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-extern.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-partial.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-partial.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-url.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-url.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-uu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-uu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mm-view.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mm-view.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mml-sec.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mml-sec.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mml-smime.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mml-smime.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mml.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mml.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mml1991.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mml1991.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/mml2015.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/mml2015.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnagent.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnagent.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnbabyl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnbabyl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nndb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nndb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nndiary.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nndiary.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,7 +22,8 @@
 
 ;; 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 
 ;;; Commentary:
--- a/lisp/gnus/nndir.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nndir.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nndoc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nndoc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nndraft.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nndraft.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nneething.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nneething.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnfolder.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnfolder.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nngateway.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nngateway.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnheader.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnheader.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnimap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnimap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnkiboze.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnkiboze.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnlistserv.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnlistserv.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnmaildir.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnmaildir.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnmbox.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnmbox.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnmh.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnmh.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnml.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnml.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnnil.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnnil.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnoo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnoo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnrss.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnrss.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnslashdot.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnslashdot.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnsoup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnsoup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnspool.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnspool.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nntp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nntp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,7 +21,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnultimate.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnultimate.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnvirtual.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnvirtual.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnwarchive.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnwarchive.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnweb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnweb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/nnwfm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/nnwfm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/pgg-def.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg-def.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/gnus/pgg-gpg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg-gpg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/gnus/pgg-parse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg-parse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/pgg-pgp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg-pgp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/gnus/pgg-pgp5.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg-pgp5.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/gnus/pgg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pgg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/pop3.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/pop3.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/qp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/qp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/rfc1843.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/rfc1843.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/rfc2045.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/rfc2045.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;; RFC 2045 is: "Multipurpose Internet Mail Extensions (MIME) Part
 ;; One:  Format of Internet Message Bodies".
--- a/lisp/gnus/rfc2047.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/rfc2047.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/rfc2104.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/rfc2104.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/rfc2231.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/rfc2231.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/score-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/score-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/sha1.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/sha1.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/gnus/sieve-manage.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/sieve-manage.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/sieve-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/sieve-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/sieve.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/sieve.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/smiley.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/smiley.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/smime.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/smime.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/spam-report.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/spam-report.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/spam-stat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/spam-stat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/spam.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/spam.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/starttls.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/starttls.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/utf7.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/utf7.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/uudecode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/uudecode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/webmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/webmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gnus/yenc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gnus/yenc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/gs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/gs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/help-at-pt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/help-at-pt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/help-fns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/help-fns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/help-macro.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/help-macro.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/help-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/help-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/help.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/help.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/hexl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/hexl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/hi-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/hi-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/hilit-chg.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/hilit-chg.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/hippie-exp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/hippie-exp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/hl-line.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/hl-line.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/ibuf-ext.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ibuf-ext.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/ibuf-macs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ibuf-macs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/ibuffer.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ibuffer.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/icomplete.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/icomplete.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/ido.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ido.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Acknowledgements
 
--- a/lisp/ielm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ielm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/iimage.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/iimage.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/image-file.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/image-file.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/image-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/image-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/image.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/image.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/imenu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/imenu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/indent.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/indent.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/info-look.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/info-look.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/info-xref.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/info-xref.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/info.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/info.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
@@ -45,15 +45,15 @@
 
 (defvar Info-history nil
   "Stack of info nodes user has visited.
-Each element of list is a list (FILENAME NODENAME BUFFERPOS).")
+Each element of the stack is a list (FILENAME NODENAME BUFFERPOS).")
 
 (defvar Info-history-forward nil
   "Stack of info nodes user has visited with `Info-history-back' command.
-Each element of list is a list (FILENAME NODENAME BUFFERPOS).")
+Each element of the stack is a list (FILENAME NODENAME BUFFERPOS).")
 
 (defvar Info-history-list nil
   "List of all info nodes user has visited.
-Each element of list is a list (FILENAME NODENAME).")
+Each element of the list is a list (FILENAME NODENAME).")
 
 (defcustom Info-enable-edit nil
   "*Non-nil means the \\<Info-mode-map>\\[Info-edit] command in Info can edit the current node.
@@ -3609,7 +3609,6 @@
     keymap)
   "Keymap to put on the Prev link in the text or the header line.")
 
-
 (defvar Info-up-link-keymap
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap [header-line mouse-1] 'Info-up)
@@ -4094,8 +4093,7 @@
 
 (defun Info-speedbar-fetch-file-nodes (nodespec)
   "Fetch the subnodes from the info NODESPEC.
-NODESPEC is a string of the form: (file)node.
-Optional THISFILE represends the filename of"
+NODESPEC is a string of the form: (file)node."
   (save-excursion
     ;; Set up a buffer we can use to fake-out Info.
     (set-buffer (get-buffer-create "*info-browse-tmp*"))
--- a/lisp/informat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/informat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/international/ccl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/ccl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/characters.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/characters.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/code-pages.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/code-pages.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/codepage.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/codepage.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/international/encoded-kb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/encoded-kb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/international/fontset.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/fontset.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/isearch-x.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/isearch-x.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/international/iso-ascii.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/iso-ascii.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/iso-cvt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/iso-cvt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;; This lisp code is a general framework for translating various
--- a/lisp/international/iso-insert.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/iso-insert.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/iso-swed.el	Tue Jul 05 22:12:55 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
-
-;; Copyright (C) 1987 Free Software Foundation, Inc.
-
-;; Author: Howard Gayle
-;; Maintainer: FSF
-;; Keywords: i18n
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs 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.
-
-;; GNU Emacs 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 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.
-
-;;; Commentary:
-
-;; Written by Howard Gayle.  See case-table.el for details.
-
-;;; Code:
-
-;; This code sets up to display ISO 8859/1 characters on
-;; terminals that have ASCII in the G0 set and a Swedish/Finnish
-;; version of ISO 646 in the G1 set.  The G1 set differs from
-;; ASCII as follows:
-;;
-;; ASCII G1
-;;     $ general currency sign
-;;     @ capital E with acute accent
-;;     [ capital A with diaeresis or umlaut mark
-;;     \ capital O with diaeresis or umlaut mark
-;;     ] capital A with ring
-;;     ^ capital U with diaeresis or umlaut mark
-;;     ` small e with acute accent
-;;     { small a with diaeresis or umlaut mark
-;;     | small o with diaeresis or umlaut mark
-;;     } small a with ring
-;;     ~ small u with diaeresis or umlaut mark
-
-(require 'disp-table)
-
-(standard-display-ascii 160 "{_}")   ; NBSP (no-break space)
-(standard-display-ascii 161 "{!}")   ; inverted exclamation mark
-(standard-display-ascii 162 "{c}")   ; cent sign
-(standard-display-ascii 163 "{GBP}") ; pound sign
-(standard-display-g1    164 ?$)      ; general currency sign
-(standard-display-ascii 165 "{JPY}") ; yen sign
-(standard-display-ascii 166 "{|}")   ; broken vertical line
-(standard-display-ascii 167 "{S}")   ; section sign
-(standard-display-ascii 168 "{\"}")  ; diaeresis
-(standard-display-ascii 169 "{C}")   ; copyright sign
-(standard-display-ascii 170 "{_a}")  ; ordinal indicator, feminine
-(standard-display-ascii 171 "{<<}")  ; left angle quotation mark
-(standard-display-ascii 172 "{~}")   ; not sign
-(standard-display-ascii 173 "{-}")   ; soft hyphen
-(standard-display-ascii 174 "{R}")   ; registered sign
-(standard-display-ascii 175 "{=}")   ; macron
-(standard-display-ascii 176 "{o}")   ; degree sign
-(standard-display-ascii 177 "{+-}")  ; plus or minus sign
-(standard-display-ascii 178 "{2}")   ; superscript two
-(standard-display-ascii 179 "{3}")   ; superscript three
-(standard-display-ascii 180 "{'}")   ; acute accent
-(standard-display-ascii 181 "{u}")   ; micro sign
-(standard-display-ascii 182 "{P}")   ; pilcrow
-(standard-display-ascii 183 "{.}")   ; middle dot
-(standard-display-ascii 184 "{,}")   ; cedilla
-(standard-display-ascii 185 "{1}")   ; superscript one
-(standard-display-ascii 186 "{_o}")  ; ordinal indicator, masculine
-(standard-display-ascii 187 "{>>}")  ; right angle quotation mark
-(standard-display-ascii 188 "{1/4}") ; fraction one-quarter
-(standard-display-ascii 189 "{1/2}") ; fraction one-half
-(standard-display-ascii 190 "{3/4}") ; fraction three-quarters
-(standard-display-ascii 191 "{?}")   ; inverted question mark
-(standard-display-ascii 192 "{`A}")  ; A with grave accent
-(standard-display-ascii 193 "{'A}")  ; A with acute accent
-(standard-display-ascii 194 "{^A}")  ; A with circumflex accent
-(standard-display-ascii 195 "{~A}")  ; A with tilde
-(standard-display-g1    196 ?[)      ; A with diaeresis or umlaut mark
-(standard-display-g1    197 ?])      ; A with ring
-(standard-display-ascii 198 "{AE}")  ; AE diphthong
-(standard-display-ascii 199 "{,C}")  ; C with cedilla
-(standard-display-ascii 200 "{`E}")  ; E with grave accent
-(standard-display-g1    201 ?@)      ; E with acute accent
-(standard-display-ascii 202 "{^E}")  ; E with circumflex accent
-(standard-display-ascii 203 "{\"E}") ; E with diaeresis or umlaut mark
-(standard-display-ascii 204 "{`I}")  ; I with grave accent
-(standard-display-ascii 205 "{'I}")  ; I with acute accent
-(standard-display-ascii 206 "{^I}")  ; I with circumflex accent
-(standard-display-ascii 207 "{\"I}") ; I with diaeresis or umlaut mark
-(standard-display-ascii 208 "{-D}")  ; D with stroke, Icelandic eth
-(standard-display-ascii 209 "{~N}")  ; N with tilde
-(standard-display-ascii 210 "{`O}")  ; O with grave accent
-(standard-display-ascii 211 "{'O}")  ; O with acute accent
-(standard-display-ascii 212 "{^O}")  ; O with circumflex accent
-(standard-display-ascii 213 "{~O}")  ; O with tilde
-(standard-display-g1    214 ?\\)     ; O with diaeresis or umlaut mark
-(standard-display-ascii 215 "{x}")   ; multiplication sign
-(standard-display-ascii 216 "{/O}")  ; O with slash
-(standard-display-ascii 217 "{`U}")  ; U with grave accent
-(standard-display-ascii 218 "{'U}")  ; U with acute accent
-(standard-display-ascii 219 "{^U}")  ; U with circumflex accent
-(standard-display-g1    220 ?^)      ; U with diaeresis or umlaut mark
-(standard-display-ascii 221 "{'Y}")  ; Y with acute accent
-(standard-display-ascii 222 "{TH}")  ; capital thorn, Icelandic
-(standard-display-ascii 223 "{ss}")  ; small sharp s, German
-(standard-display-ascii 224 "{`a}")  ; a with grave accent
-(standard-display-ascii 225 "{'a}")  ; a with acute accent
-(standard-display-ascii 226 "{^a}")  ; a with circumflex accent
-(standard-display-ascii 227 "{~a}")  ; a with tilde
-(standard-display-g1    228 ?{)      ; a with diaeresis or umlaut mark
-(standard-display-g1    229 ?})      ; a with ring
-(standard-display-ascii 230 "{ae}")  ; ae diphthong
-(standard-display-ascii 231 "{,c}")  ; c with cedilla
-(standard-display-ascii 232 "{`e}")  ; e with grave accent
-(standard-display-g1    233 ?`)      ; e with acute accent
-(standard-display-ascii 234 "{^e}")  ; e with circumflex accent
-(standard-display-ascii 235 "{\"e}") ; e with diaeresis or umlaut mark
-(standard-display-ascii 236 "{`i}")  ; i with grave accent
-(standard-display-ascii 237 "{'i}")  ; i with acute accent
-(standard-display-ascii 238 "{^i}")  ; i with circumflex accent
-(standard-display-ascii 239 "{\"i}") ; i with diaeresis or umlaut mark
-(standard-display-ascii 240 "{-d}")  ; d with stroke, Icelandic eth
-(standard-display-ascii 241 "{~n}")  ; n with tilde
-(standard-display-ascii 242 "{`o}")  ; o with grave accent
-(standard-display-ascii 243 "{'o}")  ; o with acute accent
-(standard-display-ascii 244 "{^o}")  ; o with circumflex accent
-(standard-display-ascii 245 "{~o}")  ; o with tilde
-(standard-display-g1    246 ?|)      ; o with diaeresis or umlaut mark
-(standard-display-ascii 247 "{/}")   ; division sign
-(standard-display-ascii 248 "{/o}")  ; o with slash
-(standard-display-ascii 249 "{`u}")  ; u with grave accent
-(standard-display-ascii 250 "{'u}")  ; u with acute accent
-(standard-display-ascii 251 "{^u}")  ; u with circumflex accent
-(standard-display-g1    252 ?~)      ; u with diaeresis or umlaut mark
-(standard-display-ascii 253 "{'y}")  ; y with acute accent
-(standard-display-ascii 254 "{th}")  ; small thorn, Icelandic
-(standard-display-ascii 255 "{\"y}") ; small y with diaeresis or umlaut mark
-
-(provide 'iso-swed)
-
-;;; arch-tag: 6b3dc269-660c-44b6-a25f-680b921eaf2c
-;;; iso-swed.el ends here
--- a/lisp/international/iso-transl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/iso-transl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/ja-dic-cnv.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/ja-dic-cnv.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/ja-dic-utl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/ja-dic-utl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/kinsoku.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/kinsoku.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/kkc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/kkc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/latexenc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latexenc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-1.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-1.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-2.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-2.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-3.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-3.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-4.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-4.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-5.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-5.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-8.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-8.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin-9.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin-9.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/latin1-disp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/latin1-disp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/international/mule-cmds.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/mule-cmds.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/mule-conf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/mule-conf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/mule-diag.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/mule-diag.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/mule-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/mule-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/mule.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/mule.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/ogonek.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/ogonek.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/quail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/quail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/international/subst-big5.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/subst-big5.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/international/subst-gb2312.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/subst-gb2312.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/international/subst-jis.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/subst-jis.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/international/subst-ksc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/subst-ksc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/swedish.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/swedish.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/international/titdic-cnv.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/titdic-cnv.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
@@ -641,7 +641,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License along with
 ;; CCE; see the file COPYING.  If not, write to the Free Software Foundation,
-;; 675 Mass Ave, Cambridge, MA 02139, USA.")
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
 
     ("chinese-ziranma" "$AWTH;(B"
      "ziranma.cin" cn-gb-2312 "ZIRANMA.el"
@@ -670,7 +670,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License along with
 ;; CCE; see the file COPYING.  If not, write to the Free Software Foundation,
-;; 675 Mass Ave, Cambridge, MA 02139, USA.")
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
 
     ("chinese-ctlau" "$AAuTA(B"
      "CTLau.html" cn-gb-2312 "CTLau.el"
@@ -696,7 +696,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.")
 
     ("chinese-ctlaub" "$(0N,Gn(B"
      "CTLau-b5.html" big5 "CTLau-b5.el"
@@ -722,7 +722,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.")
     ))
 
 ;; Generate a code of a Quail package in the current buffer from Tsang
--- a/lisp/international/ucs-tables.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/ucs-tables.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/utf-16.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/utf-16.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/international/utf-7.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/utf-7.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/international/utf-8.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/international/utf-8.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/isearch.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/isearch.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/isearchb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/isearchb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/iswitchb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/iswitchb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/jit-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/jit-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/jka-cmpr-hook.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/jka-cmpr-hook.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/jka-compr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/jka-compr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/kermit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/kermit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/kmacro.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/kmacro.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/china-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/china-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/language/chinese.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/chinese.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/cyril-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/cyril-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/language/cyrillic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/cyrillic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/language/czech.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/czech.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/language/devan-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/devan-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;; Created: Feb. 17. 2001
 
--- a/lisp/language/devanagari.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/devanagari.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/english.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/english.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/ethio-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/ethio-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
 
--- a/lisp/language/ethiopic.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/ethiopic.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
 
--- a/lisp/language/european.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/european.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/language/georgian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/georgian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/greek.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/greek.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/language/hebrew.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/hebrew.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/ind-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/ind-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/indian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/indian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/language/japan-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/japan-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/japanese.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/japanese.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/kannada.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/kannada.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/knd-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/knd-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;; Created: Jul. 14. 2003
 
--- a/lisp/language/korea-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/korea-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/korean.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/korean.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/lao-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/lao-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/lao.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/lao.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/malayalam.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/malayalam.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/misc-lang.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/misc-lang.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/language/mlm-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/mlm-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;; Created: Feb. 11. 2003
 
--- a/lisp/language/romanian.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/romanian.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/slovak.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/slovak.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/tamil.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/tamil.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/thai-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/thai-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/thai-word.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/thai-word.el	Tue Jul 05 22:22:24 2005 +0000
@@ -20,7 +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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; The used Thai word list has been taken from IBM's ICU4J project
 ;; (file `thai6.ucs', version 1.4, converted to TIS encoding, with
--- a/lisp/language/thai.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/thai.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/tibet-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/tibet-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
 
--- a/lisp/language/tibetan.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/tibetan.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
 
--- a/lisp/language/tml-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/tml-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;; Created: Nov. 08. 2002
 
--- a/lisp/language/utf-8-lang.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/utf-8-lang.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/language/viet-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/viet-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/language/vietnamese.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/language/vietnamese.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/ledit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ledit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/loadhist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/loadhist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/loadup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/loadup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/locate.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/locate.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/log-edit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/log-edit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/log-view.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/log-view.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/longlines.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/longlines.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/lpr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/lpr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ls-lisp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ls-lisp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/macros.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/macros.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/blessmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/blessmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/emacsbug.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/emacsbug.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/footnote.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/footnote.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/mail/mail-extr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mail-extr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mail-hist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mail-hist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mail-utils.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mail-utils.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mailabbrev.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mailabbrev.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mailalias.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mailalias.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mailheader.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mailheader.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/metamail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/metamail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/mspools.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/mspools.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/reporter.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/reporter.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rfc2368.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rfc2368.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/mail/rfc822.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rfc822.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmail-spam-filter.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmail-spam-filter.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;; -----------
--- a/lisp/mail/rmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailedit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailedit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailkwd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailkwd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailmsc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailmsc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailout.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailout.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailsort.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailsort.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/rmailsum.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/rmailsum.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/sendmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/sendmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/smtpmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/smtpmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -26,8 +26,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/supercite.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/supercite.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;; LCD Archive Entry
 ;; supercite|Barry A. Warsaw|supercite-help@python.org
--- a/lisp/mail/uce.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/uce.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/undigest.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/undigest.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mail/unrmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/unrmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mail/vms-pmail.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mail/vms-pmail.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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 =
--- a/lisp/makesum.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/makesum.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/man.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/man.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/master.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/master.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/menu-bar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/menu-bar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;; Avishai Yacobi suggested some menu rearrangements.
 
--- a/lisp/mh-e/mh-acros.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-acros.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-alias.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-alias.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-comp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-comp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-customize.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-customize.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-e.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-e.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-funcs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-funcs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-gnus.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-gnus.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-identity.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-identity.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-inc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-inc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-index.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-index.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-init.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-init.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-junk.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-junk.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-mime.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-mime.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-pick.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-pick.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/mh-e/mh-print.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-print.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;	Pp	Print to lpr              |   Default inline settings
--- a/lisp/mh-e/mh-seq.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-seq.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/mh-e/mh-speed.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-speed.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;   Future versions should only use flists.
--- a/lisp/mh-e/mh-utils.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mh-e/mh-utils.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/midnight.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/midnight.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/minibuf-eldef.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/minibuf-eldef.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/misc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/misc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mouse-copy.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mouse-copy.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mouse-drag.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mouse-drag.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/mouse-sel.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mouse-sel.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/mouse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mouse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/msb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/msb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/mwheel.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/mwheel.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/ange-ftp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/ange-ftp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/net/browse-url.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/browse-url.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/net/eudc-bob.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudc-bob.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/eudc-export.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudc-export.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/eudc-hotlist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudc-hotlist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/eudc-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudc-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/eudc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;    This package provides a common interface to query directory servers using
--- a/lisp/net/eudcb-bbdb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudcb-bbdb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;    This library provides an interface to use BBDB as a backend of
--- a/lisp/net/eudcb-ldap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudcb-ldap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;    This library provides specific LDAP protocol support for the
--- a/lisp/net/eudcb-ph.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/eudcb-ph.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/goto-addr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/goto-addr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/net/ldap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/ldap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/net/net-utils.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/net-utils.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/netrc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/netrc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/net/quickurl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/quickurl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/net/rcompile.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/rcompile.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/net/rlogin.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/rlogin.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/snmp-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/snmp-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/net/telnet.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/telnet.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/tls.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tls.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp-ftp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp-ftp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp-smb.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp-smb.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp-uu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp-uu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp-vc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp-vc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/net/tramp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/tramp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/trampver.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/trampver.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Code:
 
--- a/lisp/net/webjump.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/webjump.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/net/zone-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/net/zone-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/newcomment.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/newcomment.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/novice.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/novice.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/awk-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/awk-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/fast-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/fast-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/float.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/float.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/hilit19.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/hilit19.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/hscroll.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/hscroll.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/obsolete/iso-acc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/iso-acc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/obsolete/iso-swed.el	Tue Jul 05 22:22:24 2005 +0000
@@ -0,0 +1,152 @@
+;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
+
+;; Copyright (C) 1987 Free Software Foundation, Inc.
+
+;; Author: Howard Gayle
+;; Maintainer: FSF
+;; Keywords: i18n
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Written by Howard Gayle.  See case-table.el for details.
+
+;;; Code:
+
+;; This code sets up to display ISO 8859/1 characters on
+;; terminals that have ASCII in the G0 set and a Swedish/Finnish
+;; version of ISO 646 in the G1 set.  The G1 set differs from
+;; ASCII as follows:
+;;
+;; ASCII G1
+;;     $ general currency sign
+;;     @ capital E with acute accent
+;;     [ capital A with diaeresis or umlaut mark
+;;     \ capital O with diaeresis or umlaut mark
+;;     ] capital A with ring
+;;     ^ capital U with diaeresis or umlaut mark
+;;     ` small e with acute accent
+;;     { small a with diaeresis or umlaut mark
+;;     | small o with diaeresis or umlaut mark
+;;     } small a with ring
+;;     ~ small u with diaeresis or umlaut mark
+
+(require 'disp-table)
+
+(standard-display-ascii 160 "{_}")   ; NBSP (no-break space)
+(standard-display-ascii 161 "{!}")   ; inverted exclamation mark
+(standard-display-ascii 162 "{c}")   ; cent sign
+(standard-display-ascii 163 "{GBP}") ; pound sign
+(standard-display-g1    164 ?$)      ; general currency sign
+(standard-display-ascii 165 "{JPY}") ; yen sign
+(standard-display-ascii 166 "{|}")   ; broken vertical line
+(standard-display-ascii 167 "{S}")   ; section sign
+(standard-display-ascii 168 "{\"}")  ; diaeresis
+(standard-display-ascii 169 "{C}")   ; copyright sign
+(standard-display-ascii 170 "{_a}")  ; ordinal indicator, feminine
+(standard-display-ascii 171 "{<<}")  ; left angle quotation mark
+(standard-display-ascii 172 "{~}")   ; not sign
+(standard-display-ascii 173 "{-}")   ; soft hyphen
+(standard-display-ascii 174 "{R}")   ; registered sign
+(standard-display-ascii 175 "{=}")   ; macron
+(standard-display-ascii 176 "{o}")   ; degree sign
+(standard-display-ascii 177 "{+-}")  ; plus or minus sign
+(standard-display-ascii 178 "{2}")   ; superscript two
+(standard-display-ascii 179 "{3}")   ; superscript three
+(standard-display-ascii 180 "{'}")   ; acute accent
+(standard-display-ascii 181 "{u}")   ; micro sign
+(standard-display-ascii 182 "{P}")   ; pilcrow
+(standard-display-ascii 183 "{.}")   ; middle dot
+(standard-display-ascii 184 "{,}")   ; cedilla
+(standard-display-ascii 185 "{1}")   ; superscript one
+(standard-display-ascii 186 "{_o}")  ; ordinal indicator, masculine
+(standard-display-ascii 187 "{>>}")  ; right angle quotation mark
+(standard-display-ascii 188 "{1/4}") ; fraction one-quarter
+(standard-display-ascii 189 "{1/2}") ; fraction one-half
+(standard-display-ascii 190 "{3/4}") ; fraction three-quarters
+(standard-display-ascii 191 "{?}")   ; inverted question mark
+(standard-display-ascii 192 "{`A}")  ; A with grave accent
+(standard-display-ascii 193 "{'A}")  ; A with acute accent
+(standard-display-ascii 194 "{^A}")  ; A with circumflex accent
+(standard-display-ascii 195 "{~A}")  ; A with tilde
+(standard-display-g1    196 ?[)      ; A with diaeresis or umlaut mark
+(standard-display-g1    197 ?])      ; A with ring
+(standard-display-ascii 198 "{AE}")  ; AE diphthong
+(standard-display-ascii 199 "{,C}")  ; C with cedilla
+(standard-display-ascii 200 "{`E}")  ; E with grave accent
+(standard-display-g1    201 ?@)      ; E with acute accent
+(standard-display-ascii 202 "{^E}")  ; E with circumflex accent
+(standard-display-ascii 203 "{\"E}") ; E with diaeresis or umlaut mark
+(standard-display-ascii 204 "{`I}")  ; I with grave accent
+(standard-display-ascii 205 "{'I}")  ; I with acute accent
+(standard-display-ascii 206 "{^I}")  ; I with circumflex accent
+(standard-display-ascii 207 "{\"I}") ; I with diaeresis or umlaut mark
+(standard-display-ascii 208 "{-D}")  ; D with stroke, Icelandic eth
+(standard-display-ascii 209 "{~N}")  ; N with tilde
+(standard-display-ascii 210 "{`O}")  ; O with grave accent
+(standard-display-ascii 211 "{'O}")  ; O with acute accent
+(standard-display-ascii 212 "{^O}")  ; O with circumflex accent
+(standard-display-ascii 213 "{~O}")  ; O with tilde
+(standard-display-g1    214 ?\\)     ; O with diaeresis or umlaut mark
+(standard-display-ascii 215 "{x}")   ; multiplication sign
+(standard-display-ascii 216 "{/O}")  ; O with slash
+(standard-display-ascii 217 "{`U}")  ; U with grave accent
+(standard-display-ascii 218 "{'U}")  ; U with acute accent
+(standard-display-ascii 219 "{^U}")  ; U with circumflex accent
+(standard-display-g1    220 ?^)      ; U with diaeresis or umlaut mark
+(standard-display-ascii 221 "{'Y}")  ; Y with acute accent
+(standard-display-ascii 222 "{TH}")  ; capital thorn, Icelandic
+(standard-display-ascii 223 "{ss}")  ; small sharp s, German
+(standard-display-ascii 224 "{`a}")  ; a with grave accent
+(standard-display-ascii 225 "{'a}")  ; a with acute accent
+(standard-display-ascii 226 "{^a}")  ; a with circumflex accent
+(standard-display-ascii 227 "{~a}")  ; a with tilde
+(standard-display-g1    228 ?{)      ; a with diaeresis or umlaut mark
+(standard-display-g1    229 ?})      ; a with ring
+(standard-display-ascii 230 "{ae}")  ; ae diphthong
+(standard-display-ascii 231 "{,c}")  ; c with cedilla
+(standard-display-ascii 232 "{`e}")  ; e with grave accent
+(standard-display-g1    233 ?`)      ; e with acute accent
+(standard-display-ascii 234 "{^e}")  ; e with circumflex accent
+(standard-display-ascii 235 "{\"e}") ; e with diaeresis or umlaut mark
+(standard-display-ascii 236 "{`i}")  ; i with grave accent
+(standard-display-ascii 237 "{'i}")  ; i with acute accent
+(standard-display-ascii 238 "{^i}")  ; i with circumflex accent
+(standard-display-ascii 239 "{\"i}") ; i with diaeresis or umlaut mark
+(standard-display-ascii 240 "{-d}")  ; d with stroke, Icelandic eth
+(standard-display-ascii 241 "{~n}")  ; n with tilde
+(standard-display-ascii 242 "{`o}")  ; o with grave accent
+(standard-display-ascii 243 "{'o}")  ; o with acute accent
+(standard-display-ascii 244 "{^o}")  ; o with circumflex accent
+(standard-display-ascii 245 "{~o}")  ; o with tilde
+(standard-display-g1    246 ?|)      ; o with diaeresis or umlaut mark
+(standard-display-ascii 247 "{/}")   ; division sign
+(standard-display-ascii 248 "{/o}")  ; o with slash
+(standard-display-ascii 249 "{`u}")  ; u with grave accent
+(standard-display-ascii 250 "{'u}")  ; u with acute accent
+(standard-display-ascii 251 "{^u}")  ; u with circumflex accent
+(standard-display-g1    252 ?~)      ; u with diaeresis or umlaut mark
+(standard-display-ascii 253 "{'y}")  ; y with acute accent
+(standard-display-ascii 254 "{th}")  ; small thorn, Icelandic
+(standard-display-ascii 255 "{\"y}") ; small y with diaeresis or umlaut mark
+
+(provide 'iso-swed)
+
+;;; arch-tag: 6b3dc269-660c-44b6-a25f-680b921eaf2c
+;;; iso-swed.el ends here
--- a/lisp/obsolete/keyswap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/keyswap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/lazy-lock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/lazy-lock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/mlsupport.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/mlsupport.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/ooutline.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/ooutline.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/options.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/options.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/profile.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/profile.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/rnews.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/rnews.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Change Log:
 
--- a/lisp/obsolete/rnewspost.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/rnewspost.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Change Log:
 
--- a/lisp/obsolete/rsz-mini.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/rsz-mini.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/scribe.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/scribe.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/sun-curs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/sun-curs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/sun-fns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/sun-fns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/uncompress.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/uncompress.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/x-apollo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/x-apollo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/obsolete/x-menu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/obsolete/x-menu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/outline.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/outline.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/paren.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/paren.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/paths.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/paths.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/pcmpl-cvs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcmpl-cvs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcmpl-gnu.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcmpl-gnu.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcmpl-linux.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcmpl-linux.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcmpl-rpm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcmpl-rpm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcmpl-unix.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcmpl-unix.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcomplete.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcomplete.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/pcvs-defs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcvs-defs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcvs-info.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcvs-info.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcvs-parse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcvs-parse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcvs-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcvs-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/pcvs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/pcvs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -29,8 +29,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.
 
 ;;; Commentary:
 
--- a/lisp/play/5x5.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/5x5.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/animate.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/animate.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/play/blackbox.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/blackbox.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/bruce.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/bruce.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/cookie1.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/cookie1.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/decipher.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/decipher.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/play/dissociate.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/dissociate.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/play/doctor.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/doctor.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/play/dunnet.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/dunnet.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/fortune.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/fortune.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;; This utility allows you to automatically cut regions to a fortune
--- a/lisp/play/gamegrid.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/gamegrid.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/gametree.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/gametree.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/gomoku.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/gomoku.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/handwrite.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/handwrite.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/play/landmark.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/landmark.el	Tue Jul 05 22:22:24 2005 +0000
@@ -26,8 +26,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.
 
 
 ;;; Commentary:
--- a/lisp/play/life.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/life.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/morse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/morse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/play/mpuz.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/mpuz.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/pong.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/pong.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/play/snake.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/snake.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/solitaire.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/solitaire.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/play/spook.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/spook.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/tetris.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/tetris.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/play/yow.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/yow.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/play/zone.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/play/zone.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/printing.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/printing.el	Tue Jul 05 22:22:24 2005 +0000
@@ -31,7 +31,7 @@
 
 ;; 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.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ada-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ada-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 ;;; This mode is a major mode for editing Ada83 and Ada95 source code.
--- a/lisp/progmodes/ada-prj.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ada-prj.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ada-xref.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ada-xref.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 ;;; This Package provides a set of functions to use the output of the
--- a/lisp/progmodes/antlr-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/antlr-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/asm-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/asm-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/autoconf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/autoconf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-awk.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-awk.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-bytecomp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-bytecomp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-cmds.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-cmds.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-compat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-compat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/progmodes/cc-defs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-defs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-fonts.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-fonts.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-langs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-langs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-menus.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-menus.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-styles.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-styles.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cc-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cc-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cfengine.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cfengine.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cmacexp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cmacexp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/compile.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/compile.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cperl-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cperl-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Corrections made by Ilya Zakharevich cperl@ilyaz.org
 
--- a/lisp/progmodes/cpp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cpp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/cwarn.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/cwarn.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/dcl-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/dcl-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/delphi.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/delphi.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,7 +19,7 @@
 
 ;; 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.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-abn.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-abn.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-bnf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-bnf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-dtd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-dtd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-ebx.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-ebx.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-iso.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-iso.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-otz.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-otz.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf-yac.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf-yac.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ebnf2ps.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebnf2ps.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 (defconst ebnf-version "4.2"
   "ebnf2ps.el, v 4.2 <2004/04/04 vinicius>
--- a/lisp/progmodes/ebrowse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ebrowse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,7 +21,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/etags.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/etags.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/executable.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/executable.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/f90.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/f90.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/flymake.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/flymake.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
@@ -34,13 +34,12 @@
 
 ;;;; [[ Silence the byte-compiler
 
-(eval-when-compile
-  (defvar flymake-check-start-time)
-  (defvar flymake-check-was-interrupted)
-  (defvar flymake-err-info)
-  (defvar flymake-is-running)
-  (defvar flymake-last-change-time)
-  (defvar flymake-new-err-info))
+(defvar flymake-check-start-time)
+(defvar flymake-check-was-interrupted)
+(defvar flymake-err-info)
+(defvar flymake-is-running)
+(defvar flymake-last-change-time)
+(defvar flymake-new-err-info)
 
 ;;;; ]]
 
--- a/lisp/progmodes/fortran.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/fortran.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/gdb-ui.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/gdb-ui.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/glasses.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/glasses.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/grep.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/grep.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/gud.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/gud.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/hideif.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/hideif.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/hideshow.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/hideshow.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/icon.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/icon.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/idlw-complete-structtag.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlw-complete-structtag.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/idlw-help.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlw-help.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/idlw-rinfo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlw-rinfo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/idlw-shell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlw-shell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/progmodes/idlw-toolbar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlw-toolbar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/idlwave.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/idlwave.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/inf-lisp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/inf-lisp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/ld-script.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ld-script.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,8 @@
 
 ;; 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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/m4-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/m4-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/make-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/make-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/mantemp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/mantemp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/meta-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/meta-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/mixal-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/mixal-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,8 @@
 
 ;; 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
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
 
 ;; Author: Pieter E.J. Pareit <pieter.pareit@skynet.be>
 ;; Maintainer: Pieter E.J. Pareit <pieter.pareit@skynet.be>
--- a/lisp/progmodes/octave-hlp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/octave-hlp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/octave-inf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/octave-inf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/octave-mod.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/octave-mod.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/pascal.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/pascal.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/perl-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/perl-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/prolog.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/prolog.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
@@ -56,8 +56,8 @@
   :group 'prolog)
 
 (defcustom prolog-eof-string "end_of_file.\n"
-  "*String that represents end of file for prolog.
-nil means send actual operating system end of file."
+  "*String that represents end of file for Prolog.
+When nil, send actual operating system end of file."
   :type 'string
   :group 'prolog)
 
@@ -158,7 +158,7 @@
     ))
 
 (defun prolog-indent-level ()
-  "Compute prolog indentation level."
+  "Compute Prolog indentation level."
   (save-excursion
     (beginning-of-line)
     (skip-chars-forward " \t")
--- a/lisp/progmodes/ps-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/ps-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/python.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/python.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/scheme.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/scheme.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/sh-script.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/sh-script.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/simula.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/simula.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/sql.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/sql.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/tcl.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/tcl.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;; BEFORE USE:
 ;;
--- a/lisp/progmodes/vhdl-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -28,8 +28,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.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Commentary:
--- a/lisp/progmodes/which-func.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/which-func.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/progmodes/xscheme.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/progmodes/xscheme.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/ps-bdf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ps-bdf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/ps-mule.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ps-mule.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/ps-print.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ps-print.el	Tue Jul 05 22:22:24 2005 +0000
@@ -38,7 +38,7 @@
 
 ;; 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.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/recentf.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/recentf.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/rect.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/rect.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/register.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/register.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/repeat.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/repeat.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/replace.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/replace.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/reposition.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/reposition.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/resume.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/resume.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/reveal.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/reveal.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/rfn-eshadow.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/rfn-eshadow.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/rot13.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/rot13.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/ruler-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ruler-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/s-region.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/s-region.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/saveplace.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/saveplace.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/scroll-all.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/scroll-all.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;    This mode allows multiple buffers to be 'locked' so that scrolling
--- a/lisp/scroll-bar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/scroll-bar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/select.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/select.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/server.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/server.el	Tue Jul 05 22:22:24 2005 +0000
@@ -24,8 +24,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.
 
 ;;; Commentary:
 
--- a/lisp/ses.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/ses.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/shadowfile.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/shadowfile.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/shell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/shell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/simple.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/simple.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/skeleton.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/skeleton.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/smerge-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/smerge-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/sort.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/sort.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/soundex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/soundex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/speedbar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/speedbar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/startup.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/startup.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/strokes.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/strokes.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/subr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/subr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/tabify.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tabify.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/talk.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/talk.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/tar-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tar-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/tempo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tempo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/term.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Marck 13 2001
 ;;; Fixes for CJK support by Yong Lu <lyongu@yahoo.com>.
--- a/lisp/term/AT386.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/AT386.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/bg-mouse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/bg-mouse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/term/internal.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/internal.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/iris-ansi.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/iris-ansi.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/mac-win.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/mac-win.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/news.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/news.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/pc-win.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/pc-win.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/rxvt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/rxvt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/sun-mouse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/sun-mouse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/sun.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/sun.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/sup-mouse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/sup-mouse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/term/tty-colors.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/tty-colors.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/tvi970.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/tvi970.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/vt100.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/vt100.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/w32-win.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/w32-win.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/wyse50.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/wyse50.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/term/x-win.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/x-win.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/term/xterm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/term/xterm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/terminal.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/terminal.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/artist.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/artist.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/bib-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/bib-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/bibtex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/bibtex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -26,8 +26,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/conf-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/conf-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/textmodes/dns-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/dns-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/enriched.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/enriched.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/fill.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/fill.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/flyspell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/flyspell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 ;;
--- a/lisp/textmodes/ispell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/ispell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -26,8 +26,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.
 
 ;; Note: version numbers and time stamp are not updated
 ;;   when this file is edited for release with GNU emacs.
--- a/lisp/textmodes/makeinfo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/makeinfo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/nroff-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/nroff-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/org.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/org.el	Tue Jul 05 22:22:24 2005 +0000
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 3.12
+;; Version: 3.13
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -21,8 +21,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.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
@@ -80,6 +80,10 @@
 ;;
 ;; Changes:
 ;; -------
+;; Version 3.13
+;;    - Efficiency improvements:  Fewer table re-alignments needed.
+;;    - New special lines in tables, for defining names for individual cells.
+;;
 ;; Version 3.12
 ;;    - Tables can store formulas (one per column) and compute fields.
 ;;      Not quite like a full spreadsheet, but very powerful.
@@ -178,7 +182,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "3.12"
+(defvar org-version "3.13"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -193,7 +197,7 @@
   "Are we using the new outline mode?")
 
 (defgroup org nil
-  "Outline-based notes management and organizer."
+  "Outline-based notes management and organizer "
   :tag "Org"
   :group 'outlines
   :group 'hypermedia
@@ -240,7 +244,7 @@
   "Select a key according to `org-CUA-compatible'."
   (nth (if org-CUA-compatible 2 1)
        (or (assq key org-disputed-keys)
-           (error "Invalid Key %s in `org-key'" key))))
+	   (error "Invalid Key %s in `org-key'" key))))
 
 (defcustom org-startup-folded t
   "Non-nil means, entering Org-mode will switch to OVERVIEW.
@@ -252,9 +256,9 @@
    #+STARTUP: content"
   :group 'org-startup
   :type '(choice
-          (const :tag "nofold: show all" nil)
-          (const :tag "fold: overview" t)
-          (const :tag "content: all headlines" content)))
+	  (const :tag "nofold: show all" nil)
+	  (const :tag "fold: overview" t)
+	  (const :tag "content: all headlines" content)))
 
 (defcustom org-startup-truncated t
   "Non-nil means, entering Org-mode will set `truncate-lines'.
@@ -311,11 +315,11 @@
 
 - As a sequence in the process of working on a TODO item, for example
   (setq org-todo-keywords '(\"TODO\" \"STARTED\" \"VERIFY\" \"DONE\")
-        org-todo-interpretation 'sequence)
+	org-todo-interpretation 'sequence)
 
 - As different types of TODO items, for example
   (setq org-todo-keywords '(\"URGENT\" \"RELAXED\" \"REMIND\" \"FOR_TOM\" \"DONE\")
-        org-todo-interpretation 'type)
+	org-todo-interpretation 'type)
 
 When the states are interpreted as a sequence, \\[org-todo] always cycles
 to the next state, in order to walk through all different states.  So with
@@ -338,7 +342,7 @@
 beginning of a headline."
   :group 'org-keywords
   :type '(choice (const sequence)
-                 (const type)))
+		 (const type)))
 
 (defcustom org-default-priority ?B
   "The default priority of TODO items.
@@ -445,83 +449,83 @@
   "Precompute regular expressions for current buffer."
   (when (eq major-mode 'org-mode)
     (let ((re (org-make-options-regexp
-               '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO"
-                 "STARTUP" "ARCHIVE")))
-          (splitre "[ \t]+")
-          kwds int key value cat arch)
+	       '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO"
+		 "STARTUP" "ARCHIVE")))
+	  (splitre "[ \t]+")
+	  kwds int key value cat arch)
       (save-excursion
-        (save-restriction
-          (widen)
-          (goto-char (point-min))
-          (while (re-search-forward re nil t)
-            (setq key (match-string 1) value (match-string 2))
-            (cond
-             ((equal key "CATEGORY")
-              (if (string-match "[ \t]+$" value)
-                  (setq value (replace-match "" t t value)))
-              (setq cat (intern value)))
-             ((equal key "SEQ_TODO")
-              (setq int 'sequence
-                    kwds (append kwds (org-split-string value splitre))))
-             ((equal key "PRI_TODO")
-              (setq int 'priority
-                    kwds (append kwds (org-split-string value splitre))))
-             ((equal key "TYP_TODO")
-              (setq int 'type
-                    kwds (append kwds (org-split-string value splitre))))
-             ((equal key "STARTUP")
-              (let ((opts (org-split-string value splitre))
-                    (set '(("fold" org-startup-folded t)
-                           ("nofold" org-startup-folded nil)
-                           ("content" org-startup-folded content)
-                           ("dlcheck" org-startup-with-deadline-check t)
-                           ("nodlcheck" org-startup-with-deadline-check nil)))
-                    l var val)
-                (while (setq l (assoc (pop opts) set))
-                  (setq var (nth 1 l) val (nth 2 l))
-                  (set (make-local-variable var) val))))
-             ((equal key "ARCHIVE")
-              (string-match " *$" value)
-              (setq arch (replace-match "" t t value))
-              (remove-text-properties 0 (length arch)
-                                      '(face t fontified t) arch)))
-            )))
+	(save-restriction
+	  (widen)
+	  (goto-char (point-min))
+	  (while (re-search-forward re nil t)
+	    (setq key (match-string 1) value (match-string 2))
+	    (cond
+	     ((equal key "CATEGORY")
+	      (if (string-match "[ \t]+$" value)
+		  (setq value (replace-match "" t t value)))
+	      (setq cat (intern value)))
+	     ((equal key "SEQ_TODO")
+	      (setq int 'sequence
+		    kwds (append kwds (org-split-string value splitre))))
+	     ((equal key "PRI_TODO")
+	      (setq int 'priority
+		    kwds (append kwds (org-split-string value splitre))))
+	     ((equal key "TYP_TODO")
+	      (setq int 'type
+		    kwds (append kwds (org-split-string value splitre))))
+	     ((equal key "STARTUP")
+	      (let ((opts (org-split-string value splitre))
+		    (set '(("fold" org-startup-folded t)
+			   ("nofold" org-startup-folded nil)
+			   ("content" org-startup-folded content)
+			   ("dlcheck" org-startup-with-deadline-check t)
+			   ("nodlcheck" org-startup-with-deadline-check nil)))
+		    l var val)
+		(while (setq l (assoc (pop opts) set))
+		  (setq var (nth 1 l) val (nth 2 l))
+		  (set (make-local-variable var) val))))
+	     ((equal key "ARCHIVE")
+	      (string-match " *$" value)
+	      (setq arch (replace-match "" t t value))
+	      (remove-text-properties 0 (length arch)
+				      '(face t fontified t) arch)))
+	    )))
       (and cat (set (make-local-variable 'org-category) cat))
       (and kwds (set (make-local-variable 'org-todo-keywords) kwds))
       (and arch (set (make-local-variable 'org-archive-location) arch))
       (and int (set (make-local-variable 'org-todo-interpretation) int)))
     ;; Compute the regular expressions and other local variables
     (setq org-todo-kwd-priority-p (equal org-todo-interpretation 'priority)
-          org-todo-kwd-max-priority (1- (length org-todo-keywords))
-          org-ds-keyword-length (+ 2 (max (length org-deadline-string)
-                                          (length org-scheduled-string)))
-          org-done-string
-          (nth (1- (length org-todo-keywords)) org-todo-keywords)
-          org-todo-regexp
-          (concat "\\<\\(" (mapconcat 'regexp-quote org-todo-keywords
-                                      "\\|") "\\)\\>")
-          org-not-done-regexp
-          (concat "\\<\\("
-                  (mapconcat 'regexp-quote
-                             (nreverse (cdr (reverse org-todo-keywords)))
-                             "\\|")
-                  "\\)\\>")
-          org-todo-line-regexp
-          (concat "^\\(\\*+\\)[ \t]*\\("
-                  (mapconcat 'regexp-quote org-todo-keywords "\\|")
-                  "\\)? *\\(.*\\)")
-          org-nl-done-regexp
-          (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>")
-          org-looking-at-done-regexp (concat "^" org-done-string "\\>")
-          org-deadline-regexp (concat "\\<" org-deadline-string)
-          org-deadline-time-regexp
-          (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")
-          org-deadline-line-regexp
-          (concat "\\<\\(" org-deadline-string "\\).*")
-          org-scheduled-regexp
-          (concat "\\<" org-scheduled-string)
-          org-scheduled-time-regexp
-          (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>"))
+	  org-todo-kwd-max-priority (1- (length org-todo-keywords))
+	  org-ds-keyword-length (+ 2 (max (length org-deadline-string)
+					  (length org-scheduled-string)))
+	  org-done-string
+	  (nth (1- (length org-todo-keywords)) org-todo-keywords)
+	  org-todo-regexp
+	  (concat "\\<\\(" (mapconcat 'regexp-quote org-todo-keywords
+				      "\\|") "\\)\\>")
+	  org-not-done-regexp
+	  (concat "\\<\\("
+		  (mapconcat 'regexp-quote
+			     (nreverse (cdr (reverse org-todo-keywords)))
+			     "\\|")
+		  "\\)\\>")
+	  org-todo-line-regexp
+	  (concat "^\\(\\*+\\)[ \t]*\\("
+		  (mapconcat 'regexp-quote org-todo-keywords "\\|")
+		  "\\)? *\\(.*\\)")
+	  org-nl-done-regexp
+	  (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>")
+	  org-looking-at-done-regexp (concat "^" org-done-string "\\>")
+	  org-deadline-regexp (concat "\\<" org-deadline-string)
+	  org-deadline-time-regexp
+	  (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")
+	  org-deadline-line-regexp
+	  (concat "\\<\\(" org-deadline-string "\\).*")
+	  org-scheduled-regexp
+	  (concat "\\<" org-scheduled-string)
+	  org-scheduled-time-regexp
+	  (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>"))
     (org-set-font-lock-defaults)))
 
 (defgroup org-time nil
@@ -594,12 +598,12 @@
 ;; require a variable ndays treatment.
 (defcustom org-agenda-start-on-weekday 1
   "Non-nil means, start the overview always on the specified weekday.
-0 denotes Sunday, 1 denotes Monday etc.
+0 Denotes Sunday, 1 denotes Monday etc.
 When nil, always start on the current day."
   :group 'org-agenda
   :type '(choice (const :tag "Today" nil)
-                 (const :tag "First day of month" t)
-                 (number :tag "Weekday No.")))
+		 (const :tag "First day of month" t)
+		 (number :tag "Weekday No.")))
 
 (defcustom org-agenda-ndays 7
   "Number of days to include in overview display."
@@ -623,8 +627,8 @@
 (defcustom org-calendar-to-agenda-key [?c]
   "The key to be installed in `calendar-mode-map' for switching to the agenda.
 The command `org-calendar-goto-agenda' will be bound to this key.  The
-default is the character `c' because then `c' can be used to switch back and
-forth between agenda and calendar."
+default is the character `c' because then`c' can be used to switch back and
+force between agenda and calendar."
   :group 'org-agenda
   :type 'sexp)
 
@@ -632,12 +636,12 @@
   "Sorting structure for the agenda items of a single day.
 This is a list of symbols which will be used in sequence to determine
 if an entry should be listed before another entry.  The following
-symbols are recognized:
+symbols are recognized.
 
 time-up         Put entries with time-of-day indications first, early first
 time-down       Put entries with time-of-day indications first, late first
 category-keep   Keep the default order of categories, corresponding to the
-                sequence in `org-agenda-files'.
+		sequence in `org-agenda-files'.
 category-up     Sort alphabetically by category, A-Z.
 category-down   Sort alphabetically by category, Z-A.
 priority-up     Sort numerically by priority, high priority last.
@@ -657,14 +661,14 @@
 categories by priority."
   :group 'org-agenda
   :type '(repeat
-          (choice
-           (const time-up)
-           (const time-down)
-           (const category-keep)
-           (const category-up)
-           (const category-down)
-           (const priority-up)
-           (const priority-down))))
+	  (choice
+	   (const time-up)
+	   (const time-down)
+	   (const category-keep)
+	   (const category-up)
+	   (const category-down)
+	   (const priority-up)
+	   (const priority-down))))
 
 (defcustom org-agenda-prefix-format "  %-12:c%?-12t% s"
   "Format specification for the prefix of items in the agenda buffer.
@@ -725,9 +729,9 @@
 (defcustom org-agenda-use-time-grid t
   "Non-nil means, show a time grid in the agenda schedule.
 A time grid is a set of lines for specific times (like every two hours between
-8:00 and 20:00).  The items scheduled for a day at specific times are
+8:00 and 20:00.  The items scheduled for a day at specific times are
 sorted in between these lines.
-For details about when the grid will be shown, and what it will look like, see
+For deails about when the grid will be shown, and what it will look like, see
 the variable `org-agenda-time-grid'."
   :group 'org-agenda
   :type 'boolean)
@@ -754,13 +758,13 @@
   :type
   '(list
     (set :greedy t :tag "Grid Display Options"
-         (const :tag "Show grid in single day agenda display" daily)
-         (const :tag "Show grid in weekly agenda display" weekly)
-         (const :tag "Always show grid for today" today)
-         (const :tag "Show grid only if any timed entries are present"
-                require-timed)
-         (const :tag "Skip grid times already present in an entry"
-                remove-match))
+	 (const :tag "Show grid in single day agenda display" daily)
+	 (const :tag "Show grid in weekly agenda display" weekly)
+	 (const :tag "Always show grid for today" today)
+	 (const :tag "Show grid only if any timed entries are present"
+		require-timed)
+	 (const :tag "Skip grid times already present in an entry"
+		remove-match))
     (string :tag "Grid String")
     (repeat :tag "Grid Times" (integer :tag "Time"))))
 
@@ -777,9 +781,9 @@
 the headline/diary entry."
   :group 'org-agenda
   :type '(choice
-          (const :tag "Always" t)
-          (const :tag "Never" nil)
-          (const :tag "When at beginning of entry" beg)))
+	  (const :tag "Always" t)
+	  (const :tag "Never" nil)
+	  (const :tag "When at beginning of entry" beg)))
 
 (defcustom org-sort-agenda-notime-is-late t
   "Non-nil means, items without time are considered late.
@@ -848,7 +852,7 @@
 This string consists of two parts, separated by a double-colon.
 
 The first part is a file name - when omitted, archiving happens in the same
-file.  `%s' will be replaced by the current file name (without directory part).
+file.  %s will be replaced by the current file name (without directory part).
 Archiving to a different file is useful to keep archived entries from
 contributing to the Org-mode Agenda.
 
@@ -858,19 +862,19 @@
 
 Here are a few examples:
 \"%s_archive::\"
-        If the current file is Projects.org, archive in file
-        Projects.org_archive, as top-level trees.  This is the default.
+	If the current file is Projects.org, archive in file
+	Projects.org_archive, as top-level trees.  This is the default.
 
 \"::* Archived Tasks\"
-        Archive in the current file, under the top-level headline
-        \"* Archived Tasks\".
+	Archive in the current file, under the top-level headline
+	\"* Archived Tasks\".
 
 \"~/org/archive.org::\"
-        Archive in file ~/org/archive.org (absolute path), as top-level trees.
+	Archive in file ~/org/archive.org (absolute path), as top-level trees.
 
 \"basement::** Finished Tasks\"
-        Archive in file ./basement (relative path), as level 3 trees
-        below the level 2 heading \"** Finished Tasks\".
+	Archive in file ./basement (relative path), as level 3 trees
+	below the level 2 heading \"** Finished Tasks\".
 
 You may set this option on a per-file basis by adding to the buffer a
 line like
@@ -905,17 +909,17 @@
 recommend an additional URL: prefix, so the format would be \"<URL:%s>\"."
   :group 'org-link
   :type '(choice
-          (const :tag "\"%s\"   (e.g. http://www.there.com)" "%s")
-          (const :tag "\"<%s>\"  (e.g. <http://www.there.com>)" "<%s>")
-          (const :tag "\"<URL:%s>\"  (e.g. <URL:http://www.there.com>)" "<URL:%s>")
-          (string :tag "Other" :value "<%s>")))
+	  (const :tag "\"%s\"   (e.g. http://www.there.com)" "%s")
+	  (const :tag "\"<%s>\"  (e.g. <http://www.there.com>)" "<%s>")
+	  (const :tag "\"<URL:%s>\"  (e.g. <URL:http://www.there.com>)" "<URL:%s>")
+	  (string :tag "Other" :value "<%s>")))
 
 (defcustom org-allow-space-in-links t
   "Non-nil means, file names in links may contain space characters.
 When nil, it becomes possible to put several links into a line.
 Note that in tables, a link never extends accross fields, so in a table
 it is always possible to put several links into a line.
-Changing this variable requires a re-launch of Emacs to become effective."
+Changing this varable requires a re-launch of Emacs of become effective."
   :group 'org-link
   :type 'boolean)
 
@@ -964,23 +968,23 @@
 another window."
   :group 'org-link
   :type '(list
-          (cons (const vm)
-                (choice
-                 (const vm-visit-folder)
-                 (const vm-visit-folder-other-window)
-                 (const vm-visit-folder-other-frame)))
-          (cons (const gnus)
-                (choice
-                 (const gnus)
-                 (const gnus-other-frame)))
-          (cons (const file)
-                (choice
-                 (const find-file)
-                 (const find-file-other-window)
-                 (const find-file-other-frame)))))
+	  (cons (const vm)
+		(choice
+		 (const vm-visit-folder)
+		 (const vm-visit-folder-other-window)
+		 (const vm-visit-folder-other-frame)))
+	  (cons (const gnus)
+		(choice
+		 (const gnus)
+		 (const gnus-other-frame)))
+	  (cons (const file)
+		(choice
+		 (const find-file)
+		 (const find-file-other-window)
+		 (const find-file-other-frame)))))
 
 (defcustom org-usenet-links-prefer-google nil
-  "Non-nil means, `org-store-link' will create web links to Google groups.
+  "Non-nil means, `org-store-link' will create web links to google groups.
 When nil, Gnus will be used for such links.
 Using a prefix arg to the command \\[org-store-link] (`org-store-link')
 negates this setting for the duration of the command."
@@ -999,7 +1003,7 @@
   :group 'org-link
   :type 'boolean)
 
-(defconst org-file-apps-defaults-linux
+(defconst org-file-apps-defaults-gnu
   '((t        . emacs)
     ("jpg"    . "xv %s")
     ("gif"    . "xv %s")
@@ -1061,21 +1065,21 @@
  `emacs'     The file will be visited by the current Emacs process.
  `default'   Use the default application for this file type.
  string      A command to be executed by a shell; %s will be replaced
-             by the path to the file.
+	     by the path to the file.
  sexp        A Lisp form which will be evaluated.  The file path will
-             be available in the Lisp variable `file'.
+	     be available in the Lisp variable `file'.
 For more examples, see the system specific constants
 `org-file-apps-defaults-macosx'
 `org-file-apps-defaults-windowsnt'
-`org-file-apps-defaults-linux'."
+`org-file-apps-defaults-gnu'."
   :group 'org-link
   :type '(repeat
-          (cons (string :tag "Extension")
-                (choice :value ""
-                 (const :tag "Visit with Emacs" 'emacs)
-                 (const :tag "Use system default" 'default)
-                 (string :tag "Command")
-                 (sexp :tag "Lisp form")))))
+	  (cons (string :tag "Extension")
+		(choice :value ""
+		 (const :tag "Visit with Emacs" 'emacs)
+		 (const :tag "Use system default" 'default)
+		 (string :tag "Command")
+		 (sexp :tag "Lisp form")))))
 
 
 (defgroup org-remember nil
@@ -1096,18 +1100,18 @@
 the value of `remember-data-file'."
   :group 'org-remember
   :type '(choice
-          (const :tag "Default from remember-data-file" nil)
-          file))
+	  (const :tag "Default from remember-data-file" nil)
+	  file))
 
 (defcustom org-reverse-note-order nil
   "Non-nil means, store new notes at the beginning of a file or entry.
 When nil, new notes will be filed to the end of a file or entry."
   :group 'org-remember
   :type '(choice
-          (const :tag "Reverse always" t)
-          (const :tag "Reverse never" nil)
-          (repeat :tag "By file name regexp"
-                  (cons regexp boolean))))
+	  (const :tag "Reverse always" t)
+	  (const :tag "Reverse never" nil)
+	  (repeat :tag "By file name regexp"
+		  (cons regexp boolean))))
 
 (defgroup org-table nil
   "Options concerning tables in Org-mode."
@@ -1119,13 +1123,13 @@
 When nil, such lines will be treated like ordinary lines.
 
 When equal to the symbol `optimized', the table editor will be optimized to
-do the following:
+do the following
 - Use automatic overwrite mode in front of whitespace in table fields.
-  This makes the structure of the table stay intact as long as the edited
+  This make the structure of the table stay in tact as long as the edited
   field does not exceed the column width.
 - Minimize the number of realigns.  Normally, the table is aligned each time
   TAB or RET are pressed to move to another field.  With optimization this
-  happens only if changes to a field might have changed the column width.
+  happens only if changes to a field might have  changed the column width.
 Optimization requires replacing the functions `self-insert-command',
 `delete-char', and `backward-delete-char' in Org-mode buffers, with a
 slight (in fact: unnoticeable) speed impact for normal typing.  Org-mode is
@@ -1139,9 +1143,9 @@
 but in order to toggle optimization, a restart is required."
   :group 'org-table
   :type '(choice
-          (const :tag "off" nil)
-          (const :tag "on" t)
-          (const :tag "on, optimized" optimized)))
+	  (const :tag "off" nil)
+	  (const :tag "on" t)
+	  (const :tag "on, optimized" optimized)))
 
 (defcustom org-table-default-size "5x2"
   "The default size for newly created tables, Columns x Rows."
@@ -1180,19 +1184,19 @@
 Other options offered by the customize interface are more restrictive."
   :group 'org-table
   :type '(choice
-          (const :tag "Positive Integers"
-                 "^[0-9]+$")
-          (const :tag "Integers"
-                 "^[-+]?[0-9]+$")
-          (const :tag "Floating Point Numbers"
-                 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$")
-          (const :tag "Floating Point Number or Integer"
-                 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$")
-          (const :tag "Exponential, Floating point, Integer"
-                 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
-          (const :tag "Very General Number-Like"
-                 "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$")
-          (string :tag "Regexp:")))
+	  (const :tag "Positive Integers"
+		 "^[0-9]+$")
+	  (const :tag "Integers"
+		 "^[-+]?[0-9]+$")
+	  (const :tag "Floating Point Numbers"
+		 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$")
+	  (const :tag "Floating Point Number or Integer"
+		 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$")
+	  (const :tag "Exponential, Floating point, Integer"
+		 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
+	  (const :tag "Very General Number-Like"
+		 "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$")
+	  (string :tag "Regexp:")))
 
 (defcustom org-table-number-fraction 0.5
   "Fraction of numbers in a column required to make the column align right.
@@ -1227,7 +1231,10 @@
     calc-float-format  (float 5)
     calc-angle-mode    deg
     calc-prefer-frac   nil
-    calc-symbolic-mode nil)
+    calc-symbolic-mode nil
+    calc-date-format (YYYY "-" MM "-" DD " " Www (" " HH ":" mm))
+    calc-display-working-message t
+    )
   "List with Calc mode settings for use in calc-eval for table formulas.
 The list must contain alternating symbols (calc modes variables and values.
 Don't remove any of the default settings, just change the values.  Org-mode
@@ -1266,8 +1273,8 @@
 and then use it in an equation like `$1*$c'."
   :group 'org-table-calculation
   :type '(repeat
-          (cons (string :tag "name")
-                (string :tag "value"))))
+	  (cons (string :tag "name")
+		(string :tag "value"))))
 
 (defcustom org-table-formula-numbers-only nil
   "Non-nil means, calculate only with numbers in table formulas.
@@ -1322,15 +1329,15 @@
 or use the +OPTION lines for a per-file setting."
   :group 'org-export
   :type '(repeat
-          (list
-           (string :tag "HTML language tag")
-           (string :tag "Author")
-           (string :tag "Date")
-           (string :tag "Table of Contents"))))
+	  (list
+	   (string :tag "HTML language tag")
+	   (string :tag "Author")
+	   (string :tag "Date")
+	   (string :tag "Table of Contents"))))
 
 (defcustom org-export-default-language "en"
   "The default language of HTML export, as a string.
-This should have an association in `org-export-language-setup'."
+This should have an association in `org-export-language-setup'"
   :group 'org-export
   :type 'string)
 
@@ -1455,7 +1462,7 @@
  10^24   or   10^tau     several digits will be considered 1 item
  10^-12  or   10^-tau    a leading sign with digits or a word
  x^2-y^3                 will be read as x^2 - y^3, because items are
-                         terminated by almost any nonword/nondigit char.
+			 terminated by almost any nonword/nondigit char.
  x_{i^2} or   x^(2-i)    braces or parenthesis do grouping.
 
 Still, ambiguity is possible - so when in doubt use {} to enclose the
@@ -1498,7 +1505,7 @@
   :type 'boolean)
 
 (defcustom org-export-html-show-new-buffer nil
-  "Non-nil means, popup buffer containing the exported HTML text.
+  "Non-nil means,  popup buffer containing the exported html text.
 Otherwise, the buffer will just be saved to a file and stay hidden."
   :group 'org-export
   :type 'boolean)
@@ -1664,7 +1671,7 @@
     (((class color) (background light)) (:foreground "DarkGoldenrod"))
     (((class color) (background dark)) (:foreground "LightGoldenrod"))
     (t (:bold t :italic t)))
-  "Face used for time grids."
+  "Face used for level 2 headlines."
   :group 'org-faces)
 
 (defvar org-level-faces
@@ -1771,23 +1778,26 @@
   (set (make-local-variable 'org-table-may-need-update) t)
   (make-local-hook 'before-change-functions)  ;; needed for XEmacs
   (add-hook 'before-change-functions 'org-before-change-function nil
-            'local)
+	    'local)
   ;; Paragraph regular expressions
   (set (make-local-variable 'paragraph-separate) "\f\\|[ 	]*$\\|\\([*\f]+\\)")
   (set (make-local-variable 'paragraph-start) "\f\\|[ 	]*$\\|\\([*\f]+\\)")
   ;; Inhibit auto-fill for headers, tables and fixed-width lines.
   (set (make-local-variable 'auto-fill-inhibit-regexp)
        (concat "\\*\\|#"
-               (if (or org-enable-table-editor org-enable-fixed-width-editor)
-                   (concat
-                    "\\|[ \t]*["
-                    (if org-enable-table-editor "|" "")
-                   (if org-enable-fixed-width-editor ":"  "")
-                   "]"))))
+	       (if (or org-enable-table-editor org-enable-fixed-width-editor)
+		   (concat
+		    "\\|[ \t]*["
+		    (if org-enable-table-editor "|" "")
+		   (if org-enable-fixed-width-editor ":"  "")
+		   "]"))))
   (set (make-local-variable 'fill-paragraph-function) 'org-fill-paragraph)
+  ;; Settings for Calc embedded mode
+  (set (make-local-variable 'calc-embedded-open-formula) "|\\|\n")
+  (set (make-local-variable 'calc-embedded-close-formula) "|\\|\n")
   (if (and org-insert-mode-line-in-empty-file
-           (interactive-p)
-           (= (point-min) (point-max)))
+	   (interactive-p)
+	   (= (point-min) (point-max)))
       (insert "    -*- mode: org -*-\n\n"))
 
   ;; Get rid of Outline menus, they are not needed
@@ -1805,16 +1815,16 @@
 
   (unless org-inhibit-startup
     (if org-startup-with-deadline-check
-        (call-interactively 'org-check-deadlines)
+	(call-interactively 'org-check-deadlines)
       (cond
        ((eq org-startup-folded t)
-        (org-cycle '(4)))
+	(org-cycle '(4)))
        ((eq org-startup-folded 'content)
-        (let ((this-command 'org-cycle) (last-command 'org-cycle))
-          (org-cycle '(4)) (org-cycle '(4))))))))
+	(let ((this-command 'org-cycle) (last-command 'org-cycle))
+	  (org-cycle '(4)) (org-cycle '(4))))))))
 
 (defun org-fill-paragraph (&optional justify)
-  "Re-align a table, pass through to `fill-paragraph' if no table."
+  "Re-align a table, pass through to fill-paragraph if no table."
   (save-excursion
     (beginning-of-line 1)
     (looking-at "\\s-*\\(|\\|\\+-+\\)")))
@@ -1850,7 +1860,7 @@
 
 (defconst org-ts-lengths
   (cons (length (format-time-string (car org-time-stamp-formats)))
-        (length (format-time-string (cdr org-time-stamp-formats))))
+	(length (format-time-string (cdr org-time-stamp-formats))))
   "This holds the lengths of the two different time formats.")
 (defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^\r\n>]*\\)>"
   "Regular expression for fast time stamp matching.")
@@ -1861,26 +1871,26 @@
 (defconst org-tr-regexp (concat org-ts-regexp "--?-?" org-ts-regexp)
   "Regular expression matching a time stamp range.")
 (defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?"
-                                 org-ts-regexp "\\)?")
+				 org-ts-regexp "\\)?")
   "Regular expression matching a time stamp or time stamp range.")
 
 (defun org-activate-links (limit)
   "Run through the buffer and add overlays to links."
   (if (re-search-forward org-link-regexp limit t)
       (progn
-        (add-text-properties (match-beginning 0) (match-end 0)
-                             (list 'mouse-face 'highlight
-                                   'keymap org-mouse-map))
-        t)))
+	(add-text-properties (match-beginning 0) (match-end 0)
+			     (list 'mouse-face 'highlight
+				   'keymap org-mouse-map))
+	t)))
 
 (defun org-activate-dates (limit)
   "Run through the buffer and add overlays to dates."
   (if (re-search-forward org-tsr-regexp limit t)
       (progn
-        (add-text-properties (match-beginning 0) (match-end 0)
-                             (list 'mouse-face 'highlight
-                                   'keymap org-mouse-map))
-        t)))
+	(add-text-properties (match-beginning 0) (match-end 0)
+			     (list 'mouse-face 'highlight
+				   'keymap org-mouse-map))
+	t)))
 
 (defun org-font-lock-level ()
   (save-excursion
@@ -1891,61 +1901,61 @@
 
 (defun org-set-font-lock-defaults ()
   (let ((org-font-lock-extra-keywords
-         (list
-          '(org-activate-links (0 'org-link))
-          '(org-activate-dates (0 'org-link))
-          (list (concat "^\\*+[ \t]*" org-not-done-regexp)
-                '(1 'org-warning t))
-          (list (concat "\\[#[A-Z]\\]") '(0 'org-warning t))
-          (list (concat "\\<" org-deadline-string) '(0 'org-warning t))
-          (list (concat "\\<" org-scheduled-string) '(0 'org-warning t))
-          ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
-          ;; (3 'bold))
-          ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
-          ;; (3 'italic))
-          ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
-          ;; (3 'underline))
-          (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
-                '(1 'org-warning t))
-          '("^#.*" (0 'font-lock-comment-face t))
-          (if org-fontify-done-headline
-              (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>")
-                    '(1 'org-done t) '(2 'org-headline-done t))
-            (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>")
-                  '(1 'org-done t)))
-          '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)"
-            (1 'org-table t))
-          '("^[ \t]*\\(:.*\\)" (1 'org-table t))
-          '("| *\\(=[^|\n]*\\)" (1 'org-formula t))
-          '("^[ \t]*| *\\([#!$*]\\) *|" (1 'org-formula t))
-          )))
+	 (list
+	  '(org-activate-links (0 'org-link))
+	  '(org-activate-dates (0 'org-link))
+	  (list (concat "^\\*+[ \t]*" org-not-done-regexp)
+		'(1 'org-warning t))
+	  (list (concat "\\[#[A-Z]\\]") '(0 'org-warning t))
+	  (list (concat "\\<" org-deadline-string) '(0 'org-warning t))
+	  (list (concat "\\<" org-scheduled-string) '(0 'org-warning t))
+	  ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
+	  ;; (3 'bold))
+	  ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
+	  ;; (3 'italic))
+	  ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
+	  ;; (3 'underline))
+	  (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
+		'(1 'org-warning t))
+	  '("^#.*" (0 'font-lock-comment-face t))
+	  (if org-fontify-done-headline
+	      (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>")
+		    '(1 'org-done t) '(2 'org-headline-done t))
+	    (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>")
+		  '(1 'org-done t)))
+	  '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)"
+	    (1 'org-table t))
+	  '("^[ \t]*\\(:.*\\)" (1 'org-table t))
+	  '("| *\\(=[^|\n]*\\)" (1 'org-formula t))
+	  '("^[ \t]*| *\\([#!$*_^]\\) *|" (1 'org-formula t))
+	  )))
     (set (make-local-variable 'org-font-lock-keywords)
-         (append
-          (if org-noutline-p     ; FIXME:  I am not sure if eval will work
-                                 ; on XEmacs if noutline is ever ported
-              '((eval . (list "^\\(\\*+\\).*"
-                              0 '(nth
-                                  (% (- (match-end 1) (match-beginning 1) 1)
-                                     org-n-levels)
-                                  org-level-faces)
-                              nil t)))
-            '(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]"
-               (1 (nth (% (- (match-end 2) (match-beginning 2) 1)
-                          org-n-levels)
-                       org-level-faces)
-                  nil t))))
-          org-font-lock-extra-keywords))
+	 (append
+	  (if org-noutline-p     ; FIXME:  I am not sure if eval will work
+				 ; on XEmacs if noutline is ever ported
+	      '((eval . (list "^\\(\\*+\\).*"
+			      0 '(nth
+				  (% (- (match-end 1) (match-beginning 1) 1)
+				     org-n-levels)
+				  org-level-faces)
+			      nil t)))
+	    '(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]"
+	       (1 (nth (% (- (match-end 2) (match-beginning 2) 1)
+			  org-n-levels)
+		       org-level-faces)
+		  nil t))))
+	  org-font-lock-extra-keywords))
     (set (make-local-variable 'font-lock-defaults)
-         '(org-font-lock-keywords t nil nil backward-paragraph))
+	 '(org-font-lock-keywords t nil nil backward-paragraph))
     (kill-local-variable 'font-lock-keywords) nil))
 
 (defun org-unfontify-region (beg end &optional maybe_loudly)
   "Remove fontification and activation overlays from links."
   (font-lock-default-unfontify-region beg end)
   (let* ((buffer-undo-list t)
-         (inhibit-read-only t) (inhibit-point-motion-hooks t)
-         (inhibit-modification-hooks t)
-         deactivate-mark buffer-file-name buffer-file-truename)
+	 (inhibit-read-only t) (inhibit-point-motion-hooks t)
+	 (inhibit-modification-hooks t)
+	 deactivate-mark buffer-file-name buffer-file-truename)
     (remove-text-properties beg end '(mouse-face nil keymap nil))))
 
 ;;; Visibility cycling
@@ -1956,17 +1966,17 @@
   "Visibility cycling for Org-mode.
 
 - When this function is called with a prefix argument, rotate the entire
-  buffer through 3 states (global cycling):
+  buffer through 3 states (global cycling)
   1. OVERVIEW: Show only top-level headlines.
   2. CONTENTS: Show all headlines of all levels, but no body text.
   3. SHOW ALL: Show everything.
 
 - When point is at the beginning of a headline, rotate the subtree started
-  by this line through 3 different states (local cycling):
+  by this line through 3 different states (local cycling)
   1. FOLDED:   Only the main headline is shown.
   2. CHILDREN: The main headline and the direct children are shown.  From
-               this state, you can move to one of the children and
-               zoom in further.
+	       this state, you can move to one of the children and
+	       zoom in further.
   3. SUBTREE:  Show the entire subtree, including body text.
 
 - When there is a numeric prefix, go up to a heading with level ARG, do
@@ -1982,7 +1992,7 @@
   (interactive "P")
 
   (if (or (and (bobp) (not (looking-at outline-regexp)))
-          (equal arg '(4)))
+	  (equal arg '(4)))
       ;; special case:  use global cycling
       (setq arg t))
 
@@ -1991,9 +2001,9 @@
    ((org-at-table-p 'any)
     ;; Enter the table or move to the next field in the table
     (or (org-table-recognize-table.el)
-        (progn
-          (org-table-justify-field-maybe)
-          (org-table-next-field))))
+	(progn
+	  (org-table-justify-field-maybe)
+	  (org-table-next-field))))
 
    ((eq arg t) ;; Global cycling
 
@@ -2038,7 +2048,7 @@
     (save-excursion
       (org-back-to-heading)
       (outline-up-heading (if (< arg 0) (- arg)
-                            (- (outline-level) arg)))
+			    (- (outline-level) arg)))
       (org-show-subtree)))
 
    ((save-excursion (beginning-of-line 1) (looking-at outline-regexp))
@@ -2055,33 +2065,33 @@
 	    (beginning-of-line 2)) (setq eol (point)))
 	(outline-end-of-heading)   (setq eoh (point))
 	(outline-end-of-subtree)   (setq eos (point))
-        (outline-next-heading))
+	(outline-next-heading))
       ;; Find out what to do next and set `this-command'
       (cond
        ((= eos eoh)
 	;; Nothing is hidden behind this heading
-        (message "EMPTY ENTRY")
-        (setq org-cycle-subtree-status nil))
+	(message "EMPTY ENTRY")
+	(setq org-cycle-subtree-status nil))
        ((>= eol eos)
 	;; Entire subtree is hidden in one line: open it
 	(org-show-entry)
 	(show-children)
 	(message "CHILDREN")
 	(setq org-cycle-subtree-status 'children)
-        (run-hook-with-args 'org-cycle-hook 'children))
+	(run-hook-with-args 'org-cycle-hook 'children))
        ((and (eq last-command this-command)
 	     (eq org-cycle-subtree-status 'children))
 	;; We just showed the children, now show everything.
 	(org-show-subtree)
 	(message "SUBTREE")
 	(setq org-cycle-subtree-status 'subtree)
-        (run-hook-with-args 'org-cycle-hook 'subtree))
+	(run-hook-with-args 'org-cycle-hook 'subtree))
        (t
 	;; Default action: hide the subtree.
 	(hide-subtree)
 	(message "FOLDED")
 	(setq org-cycle-subtree-status 'folded)
-        (run-hook-with-args 'org-cycle-hook 'folded)))))
+	(run-hook-with-args 'org-cycle-hook 'folded)))))
 
    ;; TAB emulation
    (buffer-read-only (org-back-to-heading))
@@ -2090,16 +2100,16 @@
 	t
       (eq org-cycle-emulate-tab t))
     (if (and (looking-at "[ \n\r\t]")
-             (string-match "^[ \t]*$" (buffer-substring
-                                       (point-at-bol) (point))))
-        (progn
-          (beginning-of-line 1)
-          (and (looking-at "[ \t]+") (replace-match ""))))
+	     (string-match "^[ \t]*$" (buffer-substring
+				       (point-at-bol) (point))))
+	(progn
+	  (beginning-of-line 1)
+	  (and (looking-at "[ \t]+") (replace-match ""))))
     (indent-relative))
 
    (t (save-excursion
-        (org-back-to-heading)
-        (org-cycle)))))
+	(org-back-to-heading)
+	(org-cycle)))))
 
 (defun org-optimize-window-after-visibility-change (state)
   "Adjust the window after a change in outline visibility.
@@ -2171,12 +2181,12 @@
 to the new location, making it and the headline hierarchy above it visible."
   (interactive)
   (let* ((org-goto-start-pos (point))
-         (selected-point
-          (org-get-location (current-buffer) org-goto-help)))
+	 (selected-point
+	  (org-get-location (current-buffer) org-goto-help)))
     (if selected-point
-        (progn
-          (goto-char selected-point)
-          (if (org-invisible-p) (org-show-hierarchy-above)))
+	(progn
+	  (goto-char selected-point)
+	  (if (org-invisible-p) (org-show-hierarchy-above)))
       (error "Quit"))))
 
 (defun org-get-location (buf help)
@@ -2186,69 +2196,69 @@
   (let (org-selected-point)
     (save-excursion
       (save-window-excursion
-        (delete-other-windows)
-        (switch-to-buffer (get-buffer-create "*org-goto*"))
-        (with-output-to-temp-buffer "*Help*"
-          (princ help))
-        (shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
-        (setq buffer-read-only nil)
-        (erase-buffer)
-        (insert-buffer buf)
-        (let ((org-startup-truncated t)
-              (org-startup-folded t)
-              (org-startup-with-deadline-check nil))
-          (org-mode))
-        (setq buffer-read-only t)
-        (if (boundp 'org-goto-start-pos)
-            (goto-char org-goto-start-pos)
-          (goto-char (point-min)))
-        (org-beginning-of-line)
-        (message "Select location and press RET")
-        ;; now we make sure that during selection, ony very few keys work
-        ;; and that it is impossible to switch to another window.
-        (let ((gm (current-global-map))
-              (overriding-local-map org-goto-map))
-          (unwind-protect
-              (progn
-                (use-global-map org-goto-map)
-                (recursive-edit))
-            (use-global-map gm)))))
+	(delete-other-windows)
+	(switch-to-buffer (get-buffer-create "*org-goto*"))
+	(with-output-to-temp-buffer "*Help*"
+	  (princ help))
+	(shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
+	(setq buffer-read-only nil)
+	(erase-buffer)
+	(insert-buffer buf)
+	(let ((org-startup-truncated t)
+	      (org-startup-folded t)
+	      (org-startup-with-deadline-check nil))
+	  (org-mode))
+	(setq buffer-read-only t)
+	(if (boundp 'org-goto-start-pos)
+	    (goto-char org-goto-start-pos)
+	  (goto-char (point-min)))
+	(org-beginning-of-line)
+	(message "Select location and press RET")
+	;; now we make sure that during selection, ony very few keys work
+	;; and that it is impossible to switch to another window.
+	(let ((gm (current-global-map))
+	      (overriding-local-map org-goto-map))
+	  (unwind-protect
+	      (progn
+		(use-global-map org-goto-map)
+		(recursive-edit))
+	    (use-global-map gm)))))
     (kill-buffer "*org-goto*")
     org-selected-point))
 
 ;;  FIXME:  It may not be a good idea to temper with the prefix argument...
 (defun org-goto-ret (&optional arg)
-  "Finish `org-goto' by going to the new location."
+  "Finish org-goto by going to the new location."
   (interactive "P")
   (setq org-selected-point (point)
-        current-prefix-arg arg)
+	current-prefix-arg arg)
   (throw 'exit nil))
 
 (defun org-goto-left ()
-  "Finish `org-goto' by going to the new location."
+  "Finish org-goto by going to the new location."
   (interactive)
   (if (org-on-heading-p)
       (progn
-        (beginning-of-line 1)
-        (setq org-selected-point (point)
-              current-prefix-arg (- (match-end 0) (match-beginning 0)))
-        (throw 'exit nil))
+	(beginning-of-line 1)
+	(setq org-selected-point (point)
+	      current-prefix-arg (- (match-end 0) (match-beginning 0)))
+	(throw 'exit nil))
     (error "Not on a heading")))
 
 (defun org-goto-right ()
-  "Finish `org-goto' by going to the new location."
+  "Finish org-goto by going to the new location."
   (interactive)
   (if (org-on-heading-p)
       (progn
-        (outline-end-of-subtree)
-        (or (eobp) (forward-char 1))
-        (setq org-selected-point (point)
-              current-prefix-arg (- (match-end 0) (match-beginning 0)))
-        (throw 'exit nil))
+	(outline-end-of-subtree)
+	(or (eobp) (forward-char 1))
+	(setq org-selected-point (point)
+	      current-prefix-arg (- (match-end 0) (match-beginning 0)))
+	(throw 'exit nil))
     (error "Not on a heading")))
 
 (defun org-goto-quit ()
-  "Finish `org-goto' without cursor motion."
+  "Finish org-goto without cursor motion."
   (interactive)
   (setq org-selected-point nil)
   (throw 'exit nil))
@@ -2286,8 +2296,8 @@
     (outline-previous-heading)
     (looking-at org-todo-line-regexp))
   (if (or arg
-          (not (match-beginning 2))
-          (equal (match-string 2) org-done-string))
+	  (not (match-beginning 2))
+	  (equal (match-string 2) org-done-string))
       (insert (car org-todo-keywords) " ")
     (insert (match-string 2) " ")))
 
@@ -2312,7 +2322,7 @@
   (interactive)
   (save-excursion
     (if (org-region-active-p)
-        (org-map-region 'org-promote (region-beginning) (region-end))
+	(org-map-region 'org-promote (region-beginning) (region-end))
       (org-promote)))
   (org-fix-position-after-promote))
 
@@ -2323,7 +2333,7 @@
   (interactive)
   (save-excursion
     (if (org-region-active-p)
-        (org-map-region 'org-demote (region-beginning) (region-end))
+	(org-map-region 'org-demote (region-beginning) (region-end))
       (org-demote)))
   (org-fix-position-after-promote))
 
@@ -2339,11 +2349,11 @@
 in the region."
   (org-back-to-heading t)
   (let* ((level (save-match-data (funcall outline-level)))
-         (up-head (make-string (1- level) ?*)))
+	 (up-head (make-string (1- level) ?*)))
     (if (= level 1) (error "Cannot promote to level 0. UNDO to recover"))
     (replace-match up-head nil t)
     (if org-adapt-indentation
-        (org-fixup-indentation "^ " "" "^ ?\\S-"))))
+	(org-fixup-indentation "^ " "" "^ ?\\S-"))))
 
 (defun org-demote ()
   "Demote the current heading lower down the tree.
@@ -2351,10 +2361,10 @@
 in the region."
   (org-back-to-heading t)
   (let* ((level (save-match-data (funcall outline-level)))
-         (down-head (make-string (1+ level) ?*)))
+	 (down-head (make-string (1+ level) ?*)))
     (replace-match down-head nil t)
     (if org-adapt-indentation
-        (org-fixup-indentation "^ " "  " "^\\S-"))))
+	(org-fixup-indentation "^ " "  " "^\\S-"))))
 
 (defun org-map-tree (fun)
   "Call FUN for every heading underneath the current one."
@@ -2363,10 +2373,10 @@
     (save-excursion
       (funcall fun)
       (while (and (progn
-                    (outline-next-heading)
-                    (> (funcall outline-level) level))
-                  (not (eobp)))
-        (funcall fun)))))
+		    (outline-next-heading)
+		    (> (funcall outline-level) level))
+		  (not (eobp)))
+	(funcall fun)))))
 
 (defun org-map-region (fun beg end)
   "Call FUN for every heading between BEG and END."
@@ -2375,13 +2385,13 @@
       (setq end (copy-marker end))
       (goto-char beg)
       (if (and (re-search-forward (concat "^" outline-regexp) nil t)
-               (< (point) end))
-          (funcall fun))
+	       (< (point) end))
+	  (funcall fun))
       (while (and (progn
-                    (outline-next-heading)
-                    (< (point) end))
-                  (not (eobp)))
-        (funcall fun)))))
+		    (outline-next-heading)
+		    (< (point) end))
+		  (not (eobp)))
+	(funcall fun)))))
 
 (defun org-fixup-indentation (from to prohibit)
   "Change the indentation in the current entry by re-replacing FROM with TO.
@@ -2391,11 +2401,11 @@
 is changed at all."
   (save-excursion
     (let ((end (save-excursion (outline-next-heading)
-                               (point-marker))))
+			       (point-marker))))
       (unless (save-excursion (re-search-forward prohibit end t))
-        (while (re-search-forward from end t)
-          (replace-match to)
-          (beginning-of-line 2)))
+	(while (re-search-forward from end t)
+	  (replace-match to)
+	  (beginning-of-line 2)))
       (move-marker end nil))))
 
 ;;; Vertical tree motion, cutting and pasting of subtrees
@@ -2433,10 +2443,10 @@
     (if (> arg 0)
 	;; Moving forward - still need to move over subtree
 	(progn (outline-end-of-subtree)
-               (outline-next-heading)
-               (if (not (or (looking-at (concat "^" outline-regexp))
-                            (bolp)))
-                   (newline))))
+	       (outline-next-heading)
+	       (if (not (or (looking-at (concat "^" outline-regexp))
+			    (bolp)))
+		   (newline))))
     (move-marker ins-point (point))
     (setq txt (buffer-substring beg end))
     (delete-region beg end)
@@ -2470,7 +2480,7 @@
     (setq beg (point))
     (save-match-data
       (save-excursion (outline-end-of-heading)
-                      (setq folded (org-invisible-p)))
+		      (setq folded (org-invisible-p)))
       (outline-end-of-subtree))
     (if (equal (char-after) ?\n) (forward-char 1))
     (setq end (point))
@@ -2480,8 +2490,8 @@
       (if cut (kill-region beg end) (copy-region-as-kill beg end))
       (setq org-subtree-clip (current-kill 0))
       (message "%s: Subtree with %d characters"
-               (if cut "Cut" "Copied")
-               (length org-subtree-clip)))))
+	       (if cut "Cut" "Copied")
+	       (length org-subtree-clip)))))
 
 (defun org-paste-subtree (&optional level tree)
   "Paste the clipboard as a subtree, with modification of headline level.
@@ -2506,51 +2516,51 @@
      (substitute-command-keys
       "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway")))
   (let* ((txt (or tree (current-kill 0)))
-         (^re (concat "^\\(" outline-regexp "\\)"))
-         (re  (concat "\\(" outline-regexp "\\)"))
-         (^re_ (concat "\\(" outline-regexp "\\)[  \t]*"))
-
-         (old-level (if (string-match ^re txt)
-                        (- (match-end 0) (match-beginning 0))
-                      -1))
-         (force-level (cond (level (prefix-numeric-value level))
-                            ((string-match
-                              ^re_ (buffer-substring (point-at-bol) (point)))
-                             (- (match-end 0) (match-beginning 0)))
-                            (t nil)))
-         (previous-level (save-excursion
-                           (condition-case nil
-                               (progn
-                                 (outline-previous-visible-heading 1)
-                                 (if (looking-at re)
-                                     (- (match-end 0) (match-beginning 0))
-                                   1))
-                             (error 1))))
-         (next-level (save-excursion
-                       (condition-case nil
-                           (progn
-                             (outline-next-visible-heading 1)
-                             (if (looking-at re)
-                                 (- (match-end 0) (match-beginning 0))
-                               1))
-                         (error 1))))
-         (new-level (or force-level (max previous-level next-level)))
-         (shift (if (or (= old-level -1)
-                        (= new-level -1)
-                        (= old-level new-level))
-                    0
-                  (- new-level old-level)))
-         (shift1 shift)
-         (delta (if (> shift 0) -1 1))
-         (func (if (> shift 0) 'org-demote 'org-promote))
-         beg end)
+	 (^re (concat "^\\(" outline-regexp "\\)"))
+	 (re  (concat "\\(" outline-regexp "\\)"))
+	 (^re_ (concat "\\(" outline-regexp "\\)[  \t]*"))
+
+	 (old-level (if (string-match ^re txt)
+			(- (match-end 0) (match-beginning 0))
+		      -1))
+	 (force-level (cond (level (prefix-numeric-value level))
+			    ((string-match
+			      ^re_ (buffer-substring (point-at-bol) (point)))
+			     (- (match-end 0) (match-beginning 0)))
+			    (t nil)))
+	 (previous-level (save-excursion
+			   (condition-case nil
+			       (progn
+				 (outline-previous-visible-heading 1)
+				 (if (looking-at re)
+				     (- (match-end 0) (match-beginning 0))
+				   1))
+			     (error 1))))
+	 (next-level (save-excursion
+		       (condition-case nil
+			   (progn
+			     (outline-next-visible-heading 1)
+			     (if (looking-at re)
+				 (- (match-end 0) (match-beginning 0))
+			       1))
+			 (error 1))))
+	 (new-level (or force-level (max previous-level next-level)))
+	 (shift (if (or (= old-level -1)
+			(= new-level -1)
+			(= old-level new-level))
+		    0
+		  (- new-level old-level)))
+	 (shift1 shift)
+	 (delta (if (> shift 0) -1 1))
+	 (func (if (> shift 0) 'org-demote 'org-promote))
+	 beg end)
     ;; Remove the forces level indicator
     (if force-level
-        (delete-region (point-at-bol) (point)))
+	(delete-region (point-at-bol) (point)))
     ;; Make sure we start at the beginning of an empty line
     (if (not (bolp)) (insert "\n"))
     (if (not (looking-at "[ \t]*$"))
-        (progn (insert "\n") (backward-char 1)))
+	(progn (insert "\n") (backward-char 1)))
     ;; Paste
     (setq beg (point))
     (insert txt)
@@ -2558,19 +2568,19 @@
     (goto-char beg)
     ;; Shift if necessary
     (if (= shift 0)
-        (message "Pasted at level %d, without shift" new-level)
+	(message "Pasted at level %d, without shift" new-level)
       (save-restriction
-        (narrow-to-region beg end)
-        (while (not (= shift 0))
-          (org-map-region func (point-min) (point-max))
-          (setq shift (+ delta shift)))
-        (goto-char (point-min))
-        (message "Pasted at level %d, with shift by %d levels"
-                 new-level shift1)))
+	(narrow-to-region beg end)
+	(while (not (= shift 0))
+	  (org-map-region func (point-min) (point-max))
+	  (setq shift (+ delta shift)))
+	(goto-char (point-min))
+	(message "Pasted at level %d, with shift by %d levels"
+		 new-level shift1)))
     (if (and (eq org-subtree-clip (current-kill 0))
-             org-subtree-clip-folded)
-        ;; The tree was folded before it was killed/copied
-        (hide-subtree))))
+	     org-subtree-clip-folded)
+	;; The tree was folded before it was killed/copied
+	(hide-subtree))))
 
 (defun org-kill-is-subtree-p (&optional txt)
   "Check if the current kill is an outline subtree, or a set of trees.
@@ -2580,17 +2590,17 @@
 which is OK for `org-paste-subtree'.
 If optional TXT is given, check this string instead of the current kill."
   (let* ((kill (or txt (current-kill 0) ""))
-         (start-level (and (string-match (concat "\\`" outline-regexp) kill)
-                           (- (match-end 0) (match-beginning 0))))
-         (re (concat "^" outline-regexp))
-         (start 1))
+	 (start-level (and (string-match (concat "\\`" outline-regexp) kill)
+			   (- (match-end 0) (match-beginning 0))))
+	 (re (concat "^" outline-regexp))
+	 (start 1))
     (if (not start-level)
-        nil  ;; does not even start with a heading
+	nil  ;; does not even start with a heading
       (catch 'exit
-        (while (setq start (string-match re kill (1+ start)))
-          (if (< (- (match-end 0) (match-beginning 0)) start-level)
-              (throw 'exit nil)))
-        t))))
+	(while (setq start (string-match re kill (1+ start)))
+	  (if (< (- (match-end 0) (match-beginning 0)) start-level)
+	      (throw 'exit nil)))
+	t))))
 
 (defun org-archive-subtree ()
   "Move the current subtree to the archive.
@@ -2600,93 +2610,93 @@
   (interactive)
   ;; Save all relevant TODO keyword-relatex variables
   (let ((tr-org-todo-line-regexp org-todo-line-regexp) ; keep despite compiler
-        (tr-org-todo-keywords org-todo-keywords)
-        (tr-org-todo-interpretation org-todo-interpretation)
-        (tr-org-done-string org-done-string)
-        (tr-org-todo-regexp org-todo-regexp)
-        (tr-org-todo-line-regexp org-todo-line-regexp)
-        (this-buffer (current-buffer))
-        file heading buffer level newfile-p)
+	(tr-org-todo-keywords org-todo-keywords)
+	(tr-org-todo-interpretation org-todo-interpretation)
+	(tr-org-done-string org-done-string)
+	(tr-org-todo-regexp org-todo-regexp)
+	(tr-org-todo-line-regexp org-todo-line-regexp)
+	(this-buffer (current-buffer))
+	file heading buffer level newfile-p)
     (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
-        (progn
-          (setq file (format (match-string 1 org-archive-location)
-                             (file-name-nondirectory (buffer-file-name)))
-                heading (match-string 2 org-archive-location)))
+	(progn
+	  (setq file (format (match-string 1 org-archive-location)
+			     (file-name-nondirectory (buffer-file-name)))
+		heading (match-string 2 org-archive-location)))
       (error "Invalid `org-archive-location'"))
     (if (> (length file) 0)
-        (setq newfile-p (not (file-exists-p file))
-              buffer (find-file-noselect file))
+	(setq newfile-p (not (file-exists-p file))
+	      buffer (find-file-noselect file))
       (setq buffer (current-buffer)))
     (unless buffer
       (error "Cannot access file \"%s\"" file))
     (if (and (> (length heading) 0)
-             (string-match "^\\*+" heading))
-        (setq level (match-end 0))
+	     (string-match "^\\*+" heading))
+	(setq level (match-end 0))
       (setq heading nil level 0))
     (save-excursion
       (org-copy-subtree)  ; We first only copy, in case something goes wrong
       (set-buffer buffer)
       ;; Enforce org-mode for the archive buffer
       (if (not (eq major-mode 'org-mode))
-          ;; Force the mode for future visits.
-          (let ((org-insert-mode-line-in-empty-file t))
-            (call-interactively 'org-mode)))
+	  ;; Force the mode for future visits.
+	  (let ((org-insert-mode-line-in-empty-file t))
+	    (call-interactively 'org-mode)))
       (when newfile-p
-        (goto-char (point-max))
-        (insert (format "\nArchived entries from file %s\n\n"
-                        (buffer-file-name this-buffer))))
+	(goto-char (point-max))
+	(insert (format "\nArchived entries from file %s\n\n"
+			(buffer-file-name this-buffer))))
       ;; Force the TODO keywords of the original buffer
       (let ((org-todo-line-regexp tr-org-todo-line-regexp)
-            (org-todo-keywords tr-org-todo-keywords)
-            (org-todo-interpretation tr-org-todo-interpretation)
-            (org-done-string tr-org-done-string)
-            (org-todo-regexp tr-org-todo-regexp)
-            (org-todo-line-regexp tr-org-todo-line-regexp))
-        (goto-char (point-min))
-        (if heading
-            (progn
-              (if (re-search-forward
-                   (concat "\\(^\\|\r\\)"
-                           (regexp-quote heading) "[ \t]*\\($\\|\r\\)")
-                   nil t)
-                  (goto-char (match-end 0))
-                ;; Heading not found, just insert it at the end
-                (goto-char (point-max))
-                (or (bolp) (insert "\n"))
-                (insert "\n" heading "\n")
-                (end-of-line 0))
-              ;; Make the heading visible, and the following as well
-              (let ((org-show-following-heading t)) (org-show-hierarchy-above))
-              (if (re-search-forward
-                   (concat "^" (regexp-quote (make-string level ?*)) "[ \t]")
-                   nil t)
-                  (progn (goto-char (match-beginning 0)) (insert "\n")
-                         (beginning-of-line 0))
-                (goto-char (point-max)) (insert "\n")))
-          (goto-char (point-max)) (insert "\n"))
-        ;; Paste
-        (org-paste-subtree (1+ level))
-        ;; Mark the entry as done, i.e. set to last work in org-todo-keywords
-        (if org-archive-mark-done
-            (org-todo (length org-todo-keywords)))
-        ;; Move cursor to right after the TODO keyword
-        (when org-archive-stamp-time
-          (beginning-of-line 1)
-          (looking-at org-todo-line-regexp)
-          (goto-char (or (match-end 2) (match-beginning 3)))
-          (insert "(" (format-time-string (cdr org-time-stamp-formats)
-                                          (current-time))
-                  ")"))
-        ;; Save the buffer, if it is not the same buffer.
-        (if (not (eq this-buffer buffer)) (save-buffer))))
+	    (org-todo-keywords tr-org-todo-keywords)
+	    (org-todo-interpretation tr-org-todo-interpretation)
+	    (org-done-string tr-org-done-string)
+	    (org-todo-regexp tr-org-todo-regexp)
+	    (org-todo-line-regexp tr-org-todo-line-regexp))
+	(goto-char (point-min))
+	(if heading
+	    (progn
+	      (if (re-search-forward
+		   (concat "\\(^\\|\r\\)"
+			   (regexp-quote heading) "[ \t]*\\($\\|\r\\)")
+		   nil t)
+		  (goto-char (match-end 0))
+		;; Heading not found, just insert it at the end
+		(goto-char (point-max))
+		(or (bolp) (insert "\n"))
+		(insert "\n" heading "\n")
+		(end-of-line 0))
+	      ;; Make the heading visible, and the following as well
+	      (let ((org-show-following-heading t)) (org-show-hierarchy-above))
+	      (if (re-search-forward
+		   (concat "^" (regexp-quote (make-string level ?*)) "[ \t]")
+		   nil t)
+		  (progn (goto-char (match-beginning 0)) (insert "\n")
+			 (beginning-of-line 0))
+		(goto-char (point-max)) (insert "\n")))
+	  (goto-char (point-max)) (insert "\n"))
+	;; Paste
+	(org-paste-subtree (1+ level))
+	;; Mark the entry as done, i.e. set to last work in org-todo-keywords
+	(if org-archive-mark-done
+	    (org-todo (length org-todo-keywords)))
+	;; Move cursor to right after the TODO keyword
+	(when org-archive-stamp-time
+	  (beginning-of-line 1)
+	  (looking-at org-todo-line-regexp)
+	  (goto-char (or (match-end 2) (match-beginning 3)))
+	  (insert "(" (format-time-string (cdr org-time-stamp-formats)
+					  (current-time))
+		  ")"))
+	;; Save the buffer, if it is not the same buffer.
+	(if (not (eq this-buffer buffer)) (save-buffer))))
     ;; Here we are back in the original buffer.  Everything seems to have
     ;; worked.  So now cut the tree and finish up.
     (org-cut-subtree)
     (if (looking-at "[ \t]*$") (kill-line))
     (message "Subtree archived %s"
-             (if (eq this-buffer buffer)
-                 (concat "under heading: " heading)
-               (concat "in file: " (abbreviate-file-name file))))))
+	     (if (eq this-buffer buffer)
+		 (concat "under heading: " heading)
+	       (concat "in file: " (abbreviate-file-name file))))))
 
 ;;; Completion
 
@@ -2702,63 +2712,63 @@
   (interactive "P")
   (catch 'exit
     (let* ((end (point))
-           (beg (save-excursion
-                  (if (equal (char-before (point)) ?\ ) (backward-char 1))
-                  (skip-chars-backward "a-zA-Z0-9_:$")
-                  (point)))
-           (texp (equal (char-before beg) ?\\))
-           (form (equal (char-before beg) ?=))
-           (opt (equal (buffer-substring (max (point-at-bol) (- beg 2))
-                                         beg)
-                       "#+"))
-           (pattern (buffer-substring-no-properties beg end))
-           (completion-ignore-case opt)
-           (type nil)
-           (table (cond
-                   (opt
-                    (setq type :opt)
-                    (mapcar (lambda (x)
-                              (string-match "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x)
-                              (cons (match-string 2 x) (match-string 1 x)))
-                            (org-split-string (org-get-current-options) "\n")))
-                   (texp
-                    (setq type :tex)
-                    org-html-entities)
-                   (form
-                    (setq type :form)
-                    '(("sum") ("sumv") ("sumh")))
-                   ((string-match "\\`\\*+[ \t]*\\'"
-                                  (buffer-substring (point-at-bol) beg))
-                    (setq type :todo)
-                    (mapcar 'list org-todo-keywords))
-                   (t (progn (ispell-complete-word arg) (throw 'exit nil)))))
-           (completion (try-completion pattern table)))
+	   (beg (save-excursion
+		  (if (equal (char-before (point)) ?\ ) (backward-char 1))
+		  (skip-chars-backward "a-zA-Z0-9_:$")
+		  (point)))
+	   (texp (equal (char-before beg) ?\\))
+	   (form (equal (char-before beg) ?=))
+	   (opt (equal (buffer-substring (max (point-at-bol) (- beg 2))
+					 beg)
+		       "#+"))
+	   (pattern (buffer-substring-no-properties beg end))
+	   (completion-ignore-case opt)
+	   (type nil)
+	   (table (cond
+		   (opt
+		    (setq type :opt)
+		    (mapcar (lambda (x)
+			      (string-match "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x)
+			      (cons (match-string 2 x) (match-string 1 x)))
+			    (org-split-string (org-get-current-options) "\n")))
+		   (texp
+		    (setq type :tex)
+		    org-html-entities)
+		   (form
+		    (setq type :form)
+		    '(("sum") ("sumv") ("sumh")))
+		   ((string-match "\\`\\*+[ \t]*\\'"
+				  (buffer-substring (point-at-bol) beg))
+		    (setq type :todo)
+		    (mapcar 'list org-todo-keywords))
+		   (t (progn (ispell-complete-word arg) (throw 'exit nil)))))
+	   (completion (try-completion pattern table)))
       (cond ((eq completion t)
-             (if (equal type :opt)
-                 (insert (substring (cdr (assoc (upcase pattern) table))
-                                    (length pattern)))))
-            ((null completion)
-             (message "Can't find completion for \"%s\"" pattern)
-             (ding))
-            ((not (string= pattern completion))
-             (delete-region beg end)
-             (if (string-match " +$" completion)
-                 (setq completion (replace-match "" t t completion)))
-             (insert completion)
-             (if (get-buffer-window "*Completions*")
-                 (delete-window (get-buffer-window "*Completions*")))
-             (if (and (eq type :todo)
-                      (assoc completion table))
-                 (insert " "))
-             (if (and (equal type :opt) (assoc completion table))
-                 (message (substitute-command-keys
-                           "Press \\[org-complete] again to insert example settings"))))
-            (t
-             (message "Making completion list...")
-             (let ((list (sort (all-completions pattern table) 'string<)))
-               (with-output-to-temp-buffer "*Completions*"
-                 (display-completion-list list)))
-             (message "Making completion list...%s" "done"))))))
+	     (if (equal type :opt)
+		 (insert (substring (cdr (assoc (upcase pattern) table))
+				    (length pattern)))))
+	    ((null completion)
+	     (message "Can't find completion for \"%s\"" pattern)
+	     (ding))
+	    ((not (string= pattern completion))
+	     (delete-region beg end)
+	     (if (string-match " +$" completion)
+		 (setq completion (replace-match "" t t completion)))
+	     (insert completion)
+	     (if (get-buffer-window "*Completions*")
+		 (delete-window (get-buffer-window "*Completions*")))
+	     (if (and (eq type :todo)
+		      (assoc completion table))
+		 (insert " "))
+	     (if (and (equal type :opt) (assoc completion table))
+		 (message (substitute-command-keys
+			   "Press \\[org-complete] again to insert example settings"))))
+	    (t
+	     (message "Making completion list...")
+	     (let ((list (sort (all-completions pattern table) 'string<)))
+	       (with-output-to-temp-buffer "*Completions*"
+		 (display-completion-list list)))
+	     (message "Making completion list...%s" "done"))))))
 
 ;;; Comments, TODO and DEADLINE
 
@@ -2768,12 +2778,12 @@
   (save-excursion
     (org-back-to-heading)
     (if (looking-at (concat outline-regexp
-                            "\\( +\\<" org-comment-string "\\>\\)"))
-        (replace-match "" t t nil 1)
+			    "\\( +\\<" org-comment-string "\\>\\)"))
+	(replace-match "" t t nil 1)
       (if (looking-at outline-regexp)
-          (progn
-            (goto-char (match-end 0))
-            (insert " " org-comment-string))))))
+	  (progn
+	    (goto-char (match-end 0))
+	    (insert " " org-comment-string))))))
 
 (defvar org-last-todo-state-is-todo nil
   "This is non-nil when the last TODO state change led to a TODO state.
@@ -2800,44 +2810,44 @@
     (org-back-to-heading)
     (if (looking-at outline-regexp) (goto-char (match-end 0)))
     (or (looking-at (concat " +" org-todo-regexp " *"))
-        (looking-at " *"))
+	(looking-at " *"))
     (let* ((this (match-string 1))
-           (completion-ignore-case t)
-           (member (member this org-todo-keywords))
-           (tail (cdr member))
-           (state (cond
-                  ((equal arg '(4))
-                   ;; Read a state with completion
-                   (completing-read "State: " (mapcar (lambda(x) (list x))
-                                                      org-todo-keywords)
-                                    nil t))
-                  (arg
-                   ;; user requests a specific state
-                   (nth (1- (prefix-numeric-value arg))
-                        org-todo-keywords))
-                  ((null member) (car org-todo-keywords))
-                  ((null tail) nil) ;; -> first entry
-                  ((eq org-todo-interpretation 'sequence)
-                   (car tail))
-                  ((memq org-todo-interpretation '(type priority))
-                   (if (eq this-command last-command)
-                       (car tail)
-                     (if (> (length tail) 0) org-done-string nil)))
-                  (t nil)))
-           (next (if state (concat " " state " ") " ")))
+	   (completion-ignore-case t)
+	   (member (member this org-todo-keywords))
+	   (tail (cdr member))
+	   (state (cond
+		  ((equal arg '(4))
+		   ;; Read a state with completion
+		   (completing-read "State: " (mapcar (lambda(x) (list x))
+						      org-todo-keywords)
+				    nil t))
+		  (arg
+		   ;; user requests a specific state
+		   (nth (1- (prefix-numeric-value arg))
+			org-todo-keywords))
+		  ((null member) (car org-todo-keywords))
+		  ((null tail) nil) ;; -> first entry
+		  ((eq org-todo-interpretation 'sequence)
+		   (car tail))
+		  ((memq org-todo-interpretation '(type priority))
+		   (if (eq this-command last-command)
+		       (car tail)
+		     (if (> (length tail) 0) org-done-string nil)))
+		  (t nil)))
+	   (next (if state (concat " " state " ") " ")))
       (replace-match next t t)
       (setq org-last-todo-state-is-todo
-            (not (equal state org-done-string)))
+	    (not (equal state org-done-string)))
       (run-hooks 'org-after-todo-state-change-hook)))
   ;; Fixup cursor location if close to the keyword
   (if (and (outline-on-heading-p)
-           (not (bolp))
-           (save-excursion (beginning-of-line 1)
-                           (looking-at org-todo-line-regexp))
-           (< (point) (+ 2 (or (match-end 2) (match-end 1)))))
+	   (not (bolp))
+	   (save-excursion (beginning-of-line 1)
+			   (looking-at org-todo-line-regexp))
+	   (< (point) (+ 2 (or (match-end 2) (match-end 1)))))
       (progn
-        (goto-char (or (match-end 2) (match-end 1)))
-        (just-one-space))))
+	(goto-char (or (match-end 2) (match-end 1)))
+	(just-one-space))))
 
 (defun org-show-todo-tree (arg)
   "Make a compact tree which shows all headlines marked with TODO.
@@ -2845,9 +2855,9 @@
 headlines above the match."
   (interactive "P")
   (let ((case-fold-search nil)
-        (kwd-re (if arg org-todo-regexp org-not-done-regexp)))
+	(kwd-re (if arg org-todo-regexp org-not-done-regexp)))
     (message "%d TODO entries found"
-             (org-occur (concat "^" outline-regexp " +" kwd-re )))))
+	     (org-occur (concat "^" outline-regexp " +" kwd-re )))))
 
 (defun org-deadline ()
   "Insert the DEADLINE: string to make a deadline.
@@ -2857,9 +2867,9 @@
   (insert
    org-deadline-string " "
    (format-time-string (car org-time-stamp-formats)
-                       (org-read-date nil 'to-time)))
+		       (org-read-date nil 'to-time)))
   (message (substitute-command-keys
-            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+	    "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
 
 (defun org-schedule ()
   "Insert the SCHEDULED: string to schedule a TODO item.
@@ -2869,9 +2879,9 @@
   (insert
    org-scheduled-string " "
    (format-time-string (car org-time-stamp-formats)
-                       (org-read-date nil 'to-time)))
+		       (org-read-date nil 'to-time)))
   (message (substitute-command-keys
-            "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
+	    "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date.")))
 
 
 (defun org-occur (regexp &optional callback)
@@ -2879,7 +2889,7 @@
 The tree will show the lines where the regexp matches, and all higher
 headlines above the match.  It will also show the heading after the match,
 to make sure editing the matching entry is easy.
-If CALLBACK is non-nil, it is a function which is called to confirm
+if CALLBACK is non-nil, it is a function which is called to confirm
 that the match should indeed be shown."
   (interactive "sRegexp: ")
   (setq regexp (org-check-occur-regexp regexp))
@@ -2888,13 +2898,13 @@
       (goto-char (point-min))
       (hide-sublevels 1)
       (while (re-search-forward regexp nil t)
-        (when (or (not callback)
-                  (funcall callback))
-          (setq cnt (1+ cnt))
-          (org-show-hierarchy-above))))
+	(when (or (not callback)
+		  (funcall callback))
+	  (setq cnt (1+ cnt))
+	  (org-show-hierarchy-above))))
     (run-hooks 'org-occur-hook)
     (if (interactive-p)
-        (message "%d match(es) for regexp %s" cnt regexp))
+	(message "%d match(es) for regexp %s" cnt regexp))
     cnt))
 
 (defun org-show-hierarchy-above ()
@@ -2904,12 +2914,12 @@
     (org-show-hidden-entry))    ; show entire entry
   (save-excursion
     (and org-show-following-heading
-         (outline-next-heading)
-         (org-flag-heading nil)))  ; show the next heading
+	 (outline-next-heading)
+	 (org-flag-heading nil)))  ; show the next heading
   (save-excursion                  ; show all higher headings
     (while (condition-case nil
-               (progn (org-up-heading-all 1) t)
-             (error nil))
+	       (progn (org-up-heading-all 1) t)
+	     (error nil))
       (org-flag-heading nil))))
 
 ;;; Priorities
@@ -2938,39 +2948,39 @@
     (save-excursion
       (org-back-to-heading)
       (if (looking-at org-priority-regexp)
-          (setq current (string-to-char (match-string 2))
-                have t)
-        (setq current org-default-priority))
+	  (setq current (string-to-char (match-string 2))
+		have t)
+	(setq current org-default-priority))
       (cond
        ((eq action 'set)
-        (message (format "Priority A-%c, SPC to remove: " org-lowest-priority))
-        (setq new (read-char-exclusive))
-        (cond ((equal new ?\ ) (setq remove t))
-              ((or (< (upcase new) ?A) (> (upcase new) org-lowest-priority))
-               (error "Priority must be between `%c' and `%c'"
-                      ?A org-lowest-priority))))
+	(message (format "Priority A-%c, SPC to remove: " org-lowest-priority))
+	(setq new (read-char-exclusive))
+	(cond ((equal new ?\ ) (setq remove t))
+	      ((or (< (upcase new) ?A) (> (upcase new) org-lowest-priority))
+	       (error "Priority must be between `%c' and `%c'"
+		      ?A org-lowest-priority))))
        ((eq action 'up)
-        (setq new (1- current)))
+	(setq new (1- current)))
        ((eq action 'down)
-        (setq new (1+ current)))
+	(setq new (1+ current)))
        (t (error "Invalid action")))
       (setq new (min (max ?A (upcase new)) org-lowest-priority))
       (setq news (format "%c" new))
       (if have
-          (if remove
-              (replace-match "" t t nil 1)
-            (replace-match news t t nil 2))
-        (if remove
-            (error "No priority cookie found in line")
-          (looking-at org-todo-line-regexp)
-          (if (match-end 2)
-              (progn
-                (goto-char (match-end 2))
-                (insert " [#" news "]"))
-            (goto-char (match-beginning 3))
-            (insert "[#" news "] ")))))
+	  (if remove
+	      (replace-match "" t t nil 1)
+	    (replace-match news t t nil 2))
+	(if remove
+	    (error "No priority cookie found in line")
+	  (looking-at org-todo-line-regexp)
+	  (if (match-end 2)
+	      (progn
+		(goto-char (match-end 2))
+		(insert " [#" news "]"))
+	    (goto-char (match-beginning 3))
+	    (insert "[#" news "] ")))))
     (if remove
-        (message "Priority removed")
+	(message "Priority removed")
       (message "Priority of current item set to %s" news))))
 
 
@@ -2978,9 +2988,9 @@
   "Find priority cookie and return priority."
   (save-match-data
     (if (not (string-match org-priority-regexp s))
-        (* 1000 (- org-lowest-priority org-default-priority))
+	(* 1000 (- org-lowest-priority org-default-priority))
       (* 1000 (- org-lowest-priority
-                 (string-to-char (match-string 2 s)))))))
+		 (string-to-char (match-string 2 s)))))))
 
 ;;; Timestamps
 
@@ -2997,29 +3007,29 @@
 at the cursor, it will be modified."
   (interactive "P")
   (let ((fmt (if arg (cdr org-time-stamp-formats)
-               (car org-time-stamp-formats)))
-        (org-time-was-given nil)
-        time)
+	       (car org-time-stamp-formats)))
+	(org-time-was-given nil)
+	time)
     (cond
      ((and (org-at-timestamp-p)
-           (eq last-command 'org-time-stamp)
-           (eq this-command 'org-time-stamp))
+	   (eq last-command 'org-time-stamp)
+	   (eq this-command 'org-time-stamp))
       (insert "--")
       (setq time (let ((this-command this-command))
-                  (org-read-date arg 'totime)))
+		  (org-read-date arg 'totime)))
       (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
       (insert (format-time-string fmt time)))
      ((org-at-timestamp-p)
       (setq time (let ((this-command this-command))
-                   (org-read-date arg 'totime)))
+		   (org-read-date arg 'totime)))
       (and (org-at-timestamp-p) (replace-match
-                                 (setq org-last-changed-timestamp
-                                       (format-time-string fmt time))
-                                 t t))
+				 (setq org-last-changed-timestamp
+				       (format-time-string fmt time))
+				 t t))
       (message "Timestamp updated"))
      (t
       (setq time (let ((this-command this-command))
-                  (org-read-date arg 'totime)))
+		  (org-read-date arg 'totime)))
       (if org-time-was-given (setq fmt (cdr org-time-stamp-formats)))
       (insert (format-time-string fmt time))))))
 
@@ -3055,109 +3065,109 @@
 this change.  The calling routine may then choose to change the format
 used to insert the time stamp into the buffer to include the time."
   (let* ((default-time
-           ;; Default time is either today, or, when entering a range,
-           ;; the range start.
-           (if (save-excursion
-                 (re-search-backward
-                  (concat org-ts-regexp "--\\=")
-                  (- (point) 20) t))
-               (apply
-                'encode-time
-                (mapcar (lambda(x) (or x 0))  ;; FIXME: Problem with timezone?
-                        (parse-time-string (match-string 1))))
-             (current-time)))
-         (timestr (format-time-string
-                   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
-         (prompt (format "YYYY-MM-DD [%s]: " timestr))
-         ans ans1 ans2
-         second minute hour day month year tl)
+	   ;; Default time is either today, or, when entering a range,
+	   ;; the range start.
+	   (if (save-excursion
+		 (re-search-backward
+		  (concat org-ts-regexp "--\\=")
+		  (- (point) 20) t))
+	       (apply
+		'encode-time
+		(mapcar (lambda(x) (or x 0))  ;; FIXME: Problem with timezone?
+			(parse-time-string (match-string 1))))
+	     (current-time)))
+	 (timestr (format-time-string
+		   (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
+	 (prompt (format "YYYY-MM-DD [%s]: " timestr))
+	 ans ans1 ans2
+	 second minute hour day month year tl)
 
     (if org-popup-calendar-for-date-prompt
-        ;; Also show a calendar for date selection
-        ;; Copied (with modifications) from planner.el by John Wiegley
-        (save-excursion
-          (save-window-excursion
-            (calendar)
-            (calendar-forward-day (- (time-to-days default-time)
-                                     (calendar-absolute-from-gregorian
-                                      (calendar-current-date))))
-            (let* ((old-map (current-local-map))
-                   (map (copy-keymap calendar-mode-map))
-                   (minibuffer-local-map (copy-keymap minibuffer-local-map)))
-              (define-key map (kbd "RET") 'org-calendar-select)
-              (define-key map (if org-xemacs-p [button1] [mouse-1])
-                'org-calendar-select)
-              (define-key minibuffer-local-map [(meta shift left)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-backward-month 1))))
-              (define-key minibuffer-local-map [(meta shift right)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-forward-month 1))))
-              (define-key minibuffer-local-map [(shift up)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-backward-week 1))))
-              (define-key minibuffer-local-map [(shift down)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-forward-week 1))))
-              (define-key minibuffer-local-map [(shift left)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-backward-day 1))))
-              (define-key minibuffer-local-map [(shift right)]
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(calendar-forward-day 1))))
-              (define-key minibuffer-local-map ">"
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(scroll-calendar-left 1))))
-              (define-key minibuffer-local-map "<"
-                (lambda () (interactive)
-                  (org-eval-in-calendar '(scroll-calendar-right 1))))
-              (unwind-protect
-                  (progn
-                    (use-local-map map)
-                    (setq ans (read-string prompt "" nil nil))
-                    (setq ans (or ans1 ans2 ans)))
-                (use-local-map old-map)))))
+	;; Also show a calendar for date selection
+	;; Copied (with modifications) from planner.el by John Wiegley
+	(save-excursion
+	  (save-window-excursion
+	    (calendar)
+	    (calendar-forward-day (- (time-to-days default-time)
+				     (calendar-absolute-from-gregorian
+				      (calendar-current-date))))
+	    (let* ((old-map (current-local-map))
+		   (map (copy-keymap calendar-mode-map))
+		   (minibuffer-local-map (copy-keymap minibuffer-local-map)))
+	      (define-key map (kbd "RET") 'org-calendar-select)
+	      (define-key map (if org-xemacs-p [button1] [mouse-1])
+		'org-calendar-select)
+	      (define-key minibuffer-local-map [(meta shift left)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-backward-month 1))))
+	      (define-key minibuffer-local-map [(meta shift right)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-forward-month 1))))
+	      (define-key minibuffer-local-map [(shift up)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-backward-week 1))))
+	      (define-key minibuffer-local-map [(shift down)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-forward-week 1))))
+	      (define-key minibuffer-local-map [(shift left)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-backward-day 1))))
+	      (define-key minibuffer-local-map [(shift right)]
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(calendar-forward-day 1))))
+	      (define-key minibuffer-local-map ">"
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(scroll-calendar-left 1))))
+	      (define-key minibuffer-local-map "<"
+		(lambda () (interactive)
+		  (org-eval-in-calendar '(scroll-calendar-right 1))))
+	      (unwind-protect
+		  (progn
+		    (use-local-map map)
+		    (setq ans (read-string prompt "" nil nil))
+		    (setq ans (or ans1 ans2 ans)))
+		(use-local-map old-map)))))
       ;; Naked prompt only
       (setq ans (read-string prompt "" nil timestr)))
 
     (if (string-match
-         "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
-        (progn
-          (setq year (if (match-end 2)
-                         (string-to-number (match-string 2 ans))
-                       (string-to-number (format-time-string "%Y")))
-                month (string-to-number (match-string 3 ans))
-                day (string-to-number (match-string 4 ans)))
-          (if (< year 100) (setq year (+ 2000 year)))
-          (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
-                                   t t ans))))
+	 "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
+	(progn
+	  (setq year (if (match-end 2)
+			 (string-to-number (match-string 2 ans))
+		       (string-to-number (format-time-string "%Y")))
+		month (string-to-number (match-string 3 ans))
+		day (string-to-number (match-string 4 ans)))
+	  (if (< year 100) (setq year (+ 2000 year)))
+	  (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
+				   t t ans))))
     (setq tl (parse-time-string ans)
-          year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
-          month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
-          day (or (nth 3 tl) (string-to-number (format-time-string "%d")))
-          hour (or (nth 2 tl) (string-to-number (format-time-string "%H")))
-          minute (or (nth 1 tl) (string-to-number (format-time-string "%M")))
-          second (or (nth 0 tl) 0))
+	  year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
+	  month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
+	  day (or (nth 3 tl) (string-to-number (format-time-string "%d")))
+	  hour (or (nth 2 tl) (string-to-number (format-time-string "%H")))
+	  minute (or (nth 1 tl) (string-to-number (format-time-string "%M")))
+	  second (or (nth 0 tl) 0))
     (if (and (boundp 'org-time-was-given)
-             (nth 2 tl))
-        (setq org-time-was-given t))
+	     (nth 2 tl))
+	(setq org-time-was-given t))
     (if (< year 100) (setq year (+ 2000 year)))
     (if to-time
-        (encode-time second minute hour day month year)
+	(encode-time second minute hour day month year)
       (if (or (nth 1 tl) (nth 2 tl))
-          (format "%04d-%02d-%02d %02d:%02d" year month day hour minute)
-        (format "%04d-%02d-%02d" year month day)))))
+	  (format "%04d-%02d-%02d %02d:%02d" year month day hour minute)
+	(format "%04d-%02d-%02d" year month day)))))
 
 (defun org-eval-in-calendar (form)
   "Eval FORM in the calendar window and return to current window.
-Also, store the cursor date in variable `ans2'."
+Also, store the cursor date in variable ans2."
   (let ((sw (selected-window)))
     (select-window (get-buffer-window "*Calendar*"))
     (eval form)
     (when (calendar-cursor-to-date)
       (let* ((date (calendar-cursor-to-date))
-             (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
-        (setq ans2 (format-time-string "%Y-%m-%d" time))))
+	     (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
+	(setq ans2 (format-time-string "%Y-%m-%d" time))))
     (select-window sw)))
 
 (defun org-calendar-select ()
@@ -3166,7 +3176,7 @@
   (interactive)
   (when (calendar-cursor-to-date)
     (let* ((date (calendar-cursor-to-date))
-           (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
+	   (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
       (setq ans1 (format-time-string "%Y-%m-%d" time)))
     (if (active-minibuffer-window) (exit-minibuffer))))
 
@@ -3178,22 +3188,22 @@
 days.  If the prefix is a raw \\[universal-argument] prefix, all deadlines are shown."
   (interactive "P")
   (let* ((org-warn-days
-          (cond
-           ((equal ndays '(4)) 100000)
-           (ndays (prefix-numeric-value ndays))
-           (t org-deadline-warning-days)))
-         (case-fold-search nil)
-         (regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>"))
-         (callback
-          (lambda ()
-            (and (let ((d1 (time-to-days (current-time)))
-                       (d2 (time-to-days
-                            (org-time-string-to-time (match-string 1)))))
-                   (< (- d2 d1) org-warn-days))
-                 (not (org-entry-is-done-p))))))
+	  (cond
+	   ((equal ndays '(4)) 100000)
+	   (ndays (prefix-numeric-value ndays))
+	   (t org-deadline-warning-days)))
+	 (case-fold-search nil)
+	 (regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>"))
+	 (callback
+	  (lambda ()
+	    (and (let ((d1 (time-to-days (current-time)))
+		       (d2 (time-to-days
+			    (org-time-string-to-time (match-string 1)))))
+		   (< (- d2 d1) org-warn-days))
+		 (not (org-entry-is-done-p))))))
     (message "%d deadlines past-due or due within %d days"
-             (org-occur regexp callback)
-             org-warn-days)))
+	     (org-occur regexp callback)
+	     org-warn-days)))
 
 (defun org-evaluate-time-range (&optional to-buffer)
   "Evaluate a time range by computing the difference between start and end.
@@ -3209,65 +3219,65 @@
       (goto-char (point-at-bol))
       (re-search-forward org-tr-regexp (point-at-eol) t))
     (if (not (org-at-date-range-p))
-        (error "Not at a time-stamp range, and none found in current line")))
+	(error "Not at a time-stamp range, and none found in current line")))
   (let* ((ts1 (match-string 1))
-         (ts2 (match-string 2))
-         (havetime (or (> (length ts1) 15) (> (length ts2) 15)))
-         (match-end (match-end 0))
-         (time1 (org-time-string-to-time ts1))
-         (time2 (org-time-string-to-time ts2))
-         (t1 (time-to-seconds time1))
-         (t2 (time-to-seconds time2))
-         (diff (abs (- t2 t1)))
-         (negative (< (- t2 t1) 0))
-         ;; (ys (floor (* 365 24 60 60)))
-         (ds (* 24 60 60))
-         (hs (* 60 60))
-         (fy "%dy %dd %02d:%02d")
-         (fy1 "%dy %dd")
-         (fd "%dd %02d:%02d")
-         (fd1 "%dd")
-         (fh "%02d:%02d")
-         y d h m align)
+	 (ts2 (match-string 2))
+	 (havetime (or (> (length ts1) 15) (> (length ts2) 15)))
+	 (match-end (match-end 0))
+	 (time1 (org-time-string-to-time ts1))
+	 (time2 (org-time-string-to-time ts2))
+	 (t1 (time-to-seconds time1))
+	 (t2 (time-to-seconds time2))
+	 (diff (abs (- t2 t1)))
+	 (negative (< (- t2 t1) 0))
+	 ;; (ys (floor (* 365 24 60 60)))
+	 (ds (* 24 60 60))
+	 (hs (* 60 60))
+	 (fy "%dy %dd %02d:%02d")
+	 (fy1 "%dy %dd")
+	 (fd "%dd %02d:%02d")
+	 (fd1 "%dd")
+	 (fh "%02d:%02d")
+	 y d h m align)
     ;; FIXME:  Should I re-introduce years, make year refer to same date?
     ;; This would be the only useful way to have years, actually.
     (if havetime
-        (setq ; y (floor (/ diff ys))  diff (mod diff ys)
-         y 0
-         d (floor (/ diff ds))  diff (mod diff ds)
-         h (floor (/ diff hs))  diff (mod diff hs)
-         m (floor (/ diff 60)))
+	(setq ; y (floor (/ diff ys))  diff (mod diff ys)
+	 y 0
+	 d (floor (/ diff ds))  diff (mod diff ds)
+	 h (floor (/ diff hs))  diff (mod diff hs)
+	 m (floor (/ diff 60)))
       (setq ; y (floor (/ diff ys))  diff (mod diff ys)
        y 0
        d (floor (+ (/ diff ds) 0.5))
        h 0 m 0))
     (if (not to-buffer)
-        (message (org-make-tdiff-string y d h m))
+	(message (org-make-tdiff-string y d h m))
       (when (org-at-table-p)
-        (goto-char match-end)
-        (setq align t)
-        (and (looking-at " *|") (goto-char (match-end 0))))
+	(goto-char match-end)
+	(setq align t)
+	(and (looking-at " *|") (goto-char (match-end 0))))
       (if (looking-at
-           "\\( *-? *[0-9]+y\\)?\\( *[0-9]+d\\)? *[0-9][0-9]:[0-9][0-9]")
-          (replace-match ""))
+	   "\\( *-? *[0-9]+y\\)?\\( *[0-9]+d\\)? *[0-9][0-9]:[0-9][0-9]")
+	  (replace-match ""))
       (if negative (insert " -"))
       (if (> y 0) (insert " " (format (if havetime fy fy1) y d h m))
-        (if (> d 0) (insert " " (format (if havetime fd fd1) d h m))
-          (insert " " (format fh h m))))
+	(if (> d 0) (insert " " (format (if havetime fd fd1) d h m))
+	  (insert " " (format fh h m))))
       (if align (org-table-align))
       (message "Time difference inserted"))))
 
 (defun org-make-tdiff-string (y d h m)
   (let ((fmt "")
-        (l nil))
+	(l nil))
     (if (> y 0) (setq fmt (concat fmt "%d year" (if (> y 1) "s" "") " ")
-                      l (push y l)))
+		      l (push y l)))
     (if (> d 0) (setq fmt (concat fmt "%d day"  (if (> d 1) "s" "") " ")
-                      l (push d l)))
+		      l (push d l)))
     (if (> h 0) (setq fmt (concat fmt "%d hour" (if (> h 1) "s" "") " ")
-                      l (push h l)))
+		      l (push h l)))
     (if (> m 0) (setq fmt (concat fmt "%d minute" (if (> m 1) "s" "") " ")
-                      l (push m l)))
+		      l (push m l)))
     (apply 'format fmt (nreverse l))))
 
 (defun org-time-string-to-time (s)
@@ -3280,14 +3290,14 @@
 hour and minute fields will be nil if not given."
   (if (string-match org-ts-regexp1 s)
       (list 0
-            (if (or (match-beginning 8) (not nodefault))
-                (string-to-number (or (match-string 8 s) "0")))
-            (if (or (match-beginning 7) (not nodefault))
-                (string-to-number (or (match-string 7 s) "0")))
-            (string-to-number (match-string 4 s))
-            (string-to-number (match-string 3 s))
-            (string-to-number (match-string 2 s))
-            nil nil nil)
+	    (if (or (match-beginning 8) (not nodefault))
+		(string-to-number (or (match-string 8 s) "0")))
+	    (if (or (match-beginning 7) (not nodefault))
+		(string-to-number (or (match-string 7 s) "0")))
+	    (string-to-number (match-string 4 s))
+	    (string-to-number (match-string 3 s))
+	    (string-to-number (match-string 2 s))
+	    nil nil nil)
     (make-list 9 0)))
 
 (defun org-timestamp-up (&optional arg)
@@ -3324,26 +3334,26 @@
        (>= (match-end n) pos)))
 
 (defun org-at-timestamp-p ()
-  "Determine if the cursor is at a timestamp."
+  "Determine if the cursor is  or at a timestamp."
   (interactive)
   (let* ((tsr org-ts-regexp2)
-         (pos (point))
-         (ans (or (looking-at tsr)
-                  (save-excursion
-                    (skip-chars-backward "^<\n\r\t")
-                    (if (> (point) 1) (backward-char 1))
-                    (and (looking-at tsr)
-                         (> (- (match-end 0) pos) -1))))))
+	 (pos (point))
+	 (ans (or (looking-at tsr)
+		  (save-excursion
+		    (skip-chars-backward "^<\n\r\t")
+		    (if (> (point) 1) (backward-char 1))
+		    (and (looking-at tsr)
+			 (> (- (match-end 0) pos) -1))))))
     (and (boundp 'org-ts-what)
-         (setq org-ts-what
-              (cond
-               ((org-pos-in-match-range pos 2)      'year)
-               ((org-pos-in-match-range pos 3)      'month)
-               ((org-pos-in-match-range pos 7)      'hour)
-               ((org-pos-in-match-range pos 8)      'minute)
-               ((or (org-pos-in-match-range pos 4)
-                    (org-pos-in-match-range pos 5)) 'day)
-               (t 'day))))
+	 (setq org-ts-what
+	      (cond
+	       ((org-pos-in-match-range pos 2)      'year)
+	       ((org-pos-in-match-range pos 3)      'month)
+	       ((org-pos-in-match-range pos 7)      'hour)
+	       ((org-pos-in-match-range pos 8)      'minute)
+	       ((or (org-pos-in-match-range pos 4)
+		    (org-pos-in-match-range pos 5)) 'day)
+	       (t 'day))))
     ans))
 
 (defun org-timestamp-change (n &optional what)
@@ -3352,59 +3362,59 @@
 `year', `minute', `second'.  If WHAT is not given, the cursor position
 in the timestamp determines what will be changed."
   (let ((fmt (car org-time-stamp-formats))
-        org-ts-what
-        (pos (point))
-        ts time time0)
+	org-ts-what
+	(pos (point))
+	ts time time0)
     (if (not (org-at-timestamp-p))
-        (error "Not at a timestamp"))
+	(error "Not at a timestamp"))
     (setq org-ts-what (or what org-ts-what))
     (setq fmt (if (<= (abs (- (cdr org-ts-lengths)
-                              (- (match-end 0) (match-beginning 0))))
-                      1)
-                  (cdr org-time-stamp-formats)
-                (car org-time-stamp-formats)))
+			      (- (match-end 0) (match-beginning 0))))
+		      1)
+		  (cdr org-time-stamp-formats)
+		(car org-time-stamp-formats)))
     (setq ts (match-string 0))
     (replace-match "")
     (setq time0 (org-parse-time-string ts))
     (setq time
-          (apply 'encode-time
-                 (append
-                  (list (or (car time0) 0))
-                  (list (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0)))
-                  (list (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0)))
-                  (list (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0)))
-                  (list (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0)))
-                  (list (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0)))
-                  (nthcdr 6 time0))))
+	  (apply 'encode-time
+		 (append
+		  (list (or (car time0) 0))
+		  (list (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0)))
+		  (list (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0)))
+		  (list (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0)))
+		  (list (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0)))
+		  (list (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0)))
+		  (nthcdr 6 time0))))
     (if (eq what 'calendar)
-        (let ((cal-date
-               (save-excursion
-                 (save-match-data
-                   (set-buffer "*Calendar*")
-                   (calendar-cursor-to-date)))))
-          (setcar (nthcdr 4 time0) (nth 0 cal-date)) ; month
-          (setcar (nthcdr 3 time0) (nth 1 cal-date)) ; day
-          (setcar (nthcdr 5 time0) (nth 2 cal-date)) ; year
-          (setcar time0 (or (car time0) 0))
-          (setcar (nthcdr 1 time0) (or (nth 1 time0) 0))
-          (setcar (nthcdr 2 time0) (or (nth 1 time0) 0))
-          (setq time (apply 'encode-time time0))))
+	(let ((cal-date
+	       (save-excursion
+		 (save-match-data
+		   (set-buffer "*Calendar*")
+		   (calendar-cursor-to-date)))))
+	  (setcar (nthcdr 4 time0) (nth 0 cal-date)) ; month
+	  (setcar (nthcdr 3 time0) (nth 1 cal-date)) ; day
+	  (setcar (nthcdr 5 time0) (nth 2 cal-date)) ; year
+	  (setcar time0 (or (car time0) 0))
+	  (setcar (nthcdr 1 time0) (or (nth 1 time0) 0))
+	  (setcar (nthcdr 2 time0) (or (nth 1 time0) 0))
+	  (setq time (apply 'encode-time time0))))
     (insert (setq org-last-changed-timestamp (format-time-string fmt time)))
     (goto-char pos)
     ;; Try to recenter the calendar window, if any
     (if (and org-calendar-follow-timestamp-change
-             (get-buffer-window "*Calendar*" t)
-             (memq org-ts-what '(day month year)))
-        (org-recenter-calendar (time-to-days time)))))
+	     (get-buffer-window "*Calendar*" t)
+	     (memq org-ts-what '(day month year)))
+	(org-recenter-calendar (time-to-days time)))))
 
 (defun org-recenter-calendar (date)
   "If the calendar is visible, recenter it to DATE."
   (let* ((win (selected-window))
-         (cwin (get-buffer-window "*Calendar*" t)))
+	 (cwin (get-buffer-window "*Calendar*" t)))
     (when cwin
       (select-window cwin)
       (calendar-goto-date (if (listp date) date
-                            (calendar-gregorian-from-absolute date)))
+			    (calendar-gregorian-from-absolute date)))
       (select-window win))))
 
 (defun org-goto-calendar (&optional arg)
@@ -3414,13 +3424,13 @@
   (interactive "P")
   (let ((tsr org-ts-regexp) diff)
     (if (or (org-at-timestamp-p)
-            (save-excursion
-              (beginning-of-line 1)
-              (looking-at (concat ".*" tsr))))
-        (let ((d1 (time-to-days (current-time)))
-              (d2 (time-to-days
-                   (org-time-string-to-time (match-string 1)))))
-          (setq diff (- d2 d1))))
+	    (save-excursion
+	      (beginning-of-line 1)
+	      (looking-at (concat ".*" tsr))))
+	(let ((d1 (time-to-days (current-time)))
+	      (d2 (time-to-days
+		   (org-time-string-to-time (match-string 1)))))
+	  (setq diff (- d2 d1))))
     (calendar)
     (calendar-goto-today)
     (if (and diff (not arg)) (calendar-forward-day diff))))
@@ -3489,7 +3499,7 @@
 (define-key org-agenda-mode-map ">" 'org-agenda-date-prompt)
 (let ((l '(1 2 3 4 5 6 7 8 9 0)))
   (while l (define-key org-agenda-mode-map
-             (int-to-string (pop l)) 'digit-argument)))
+	     (int-to-string (pop l)) 'digit-argument)))
 
 (define-key org-agenda-mode-map "f" 'org-agenda-follow-mode)
 (define-key org-agenda-mode-map "D" 'org-agenda-toggle-diary)
@@ -3597,11 +3607,11 @@
 (defun org-agenda-maybe-reset-markers (&optional force)
   "Reset markers created by `org-agenda'.  But only if they are old enough."
   (if (or force
-          (> (- (time-to-seconds (current-time))
-                org-agenda-last-marker-time)
-             5))
+	  (> (- (time-to-seconds (current-time))
+		org-agenda-last-marker-time)
+	     5))
       (while org-agenda-markers
-        (move-marker (pop org-agenda-markers) nil))))
+	(move-marker (pop org-agenda-markers) nil))))
 
 (defvar org-agenda-new-buffers nil
   "Buffers created to visit agenda files.")
@@ -3611,7 +3621,7 @@
 it to the list of buffers which might be released later."
   (let ((buf (find-buffer-visiting file)))
     (if buf
-        buf  ; just return it
+	buf  ; just return it
       ;; Make a new buffer and remember it
       (setq buf (find-file-noselect file))
       (if buf (push buf org-agenda-new-buffers))
@@ -3625,9 +3635,9 @@
     (while (setq buf (pop blist))
       (setq file (buffer-file-name buf))
       (when (and (buffer-modified-p buf)
-                 file
-                 (y-or-n-p (format "Save file %s? " file)))
-        (with-current-buffer buf (save-buffer)))
+		 file
+		 (y-or-n-p (format "Save file %s? " file)))
+	(with-current-buffer buf (save-buffer)))
       (kill-buffer buf))))
 
 (defvar org-respect-restriction nil)    ; Dynamically-scoped param.
@@ -3645,29 +3655,29 @@
   (org-agenda-maybe-reset-markers 'force)
   (org-compile-prefix-format org-timeline-prefix-format)
   (let* ((dopast include-all)
-         (dotodo (equal include-all '(16)))
-         (entry (buffer-file-name))
-         (org-agenda-files (list (buffer-file-name)))
-         (date (calendar-current-date))
-         (win (selected-window))
-         (pos1 (point))
-         (beg (if (org-region-active-p) (region-beginning) (point-min)))
-         (end (if (org-region-active-p) (region-end) (point-max)))
-         (day-numbers (org-get-all-dates beg end 'no-ranges
-                                         t)) ; always include today
-         (today (time-to-days (current-time)))
-         (org-respect-restriction t)
-         (past t)
-         s e rtn d)
+	 (dotodo (equal include-all '(16)))
+	 (entry (buffer-file-name))
+	 (org-agenda-files (list (buffer-file-name)))
+	 (date (calendar-current-date))
+	 (win (selected-window))
+	 (pos1 (point))
+	 (beg (if (org-region-active-p) (region-beginning) (point-min)))
+	 (end (if (org-region-active-p) (region-end) (point-max)))
+	 (day-numbers (org-get-all-dates beg end 'no-ranges
+					 t)) ; always include today
+	 (today (time-to-days (current-time)))
+	 (org-respect-restriction t)
+	 (past t)
+	 s e rtn d)
     (setq org-agenda-redo-command
-          (list 'progn
-                (list 'switch-to-buffer-other-window (current-buffer))
-                (list 'org-timeline include-all)))
+	  (list 'progn
+		(list 'switch-to-buffer-other-window (current-buffer))
+		(list 'org-timeline (list 'quote include-all))))
     (if (not dopast)
-        ;; Remove past dates from the list of dates.
-        (setq day-numbers (delq nil (mapcar (lambda(x)
-                                              (if (>= x today) x nil))
-                                            day-numbers))))
+	;; Remove past dates from the list of dates.
+	(setq day-numbers (delq nil (mapcar (lambda(x)
+					      (if (>= x today) x nil))
+					    day-numbers))))
     (switch-to-buffer-other-window
      (get-buffer-create org-agenda-buffer-name))
     (setq buffer-read-only nil)
@@ -3675,33 +3685,33 @@
     (org-agenda-mode) (setq buffer-read-only nil)
     (while (setq d (pop day-numbers))
       (if (and (>= d today)
-               dopast
-               past)
-          (progn
-            (setq past nil)
-            (insert (make-string 79 ?-) "\n")))
+	       dopast
+	       past)
+	  (progn
+	    (setq past nil)
+	    (insert (make-string 79 ?-) "\n")))
       (setq date (calendar-gregorian-from-absolute d))
       (setq s (point))
       (if dotodo
-          (setq rtn (org-agenda-get-day-entries
-                     entry date :todo :timestamp))
-        (setq rtn (org-agenda-get-day-entries entry date :timestamp)))
+	  (setq rtn (org-agenda-get-day-entries
+		     entry date :todo :timestamp))
+	(setq rtn (org-agenda-get-day-entries entry date :timestamp)))
       (if (or rtn (equal d today))
-          (progn
-            (insert (calendar-day-name date) " "
-                    (number-to-string (extract-calendar-day date)) " "
-                    (calendar-month-name (extract-calendar-month date)) " "
-                    (number-to-string (extract-calendar-year date)) "\n")
-            (put-text-property s (1- (point)) 'face
-                               'org-link)
-            (if (equal d today)
-                (put-text-property s (1- (point)) 'org-today t))
-            (insert (org-finalize-agenda-entries rtn) "\n")
-            (put-text-property s (1- (point)) 'day d))))
+	  (progn
+	    (insert (calendar-day-name date) " "
+		    (number-to-string (extract-calendar-day date)) " "
+		    (calendar-month-name (extract-calendar-month date)) " "
+		    (number-to-string (extract-calendar-year date)) "\n")
+	    (put-text-property s (1- (point)) 'face
+			       'org-link)
+	    (if (equal d today)
+		(put-text-property s (1- (point)) 'org-today t))
+	    (insert (org-finalize-agenda-entries rtn) "\n")
+	    (put-text-property s (1- (point)) 'day d))))
     (goto-char (point-min))
     (setq buffer-read-only t)
     (goto-char (or (text-property-any (point-min) (point-max) 'org-today t)
-                   (point-min)))
+		   (point-min)))
     (when (not org-select-timeline-window)
       (select-window win)
       (goto-char pos1))))
@@ -3721,107 +3731,107 @@
   (org-compile-prefix-format org-agenda-prefix-format)
   (require 'calendar)
   (let* ((org-agenda-start-on-weekday
-          (if (or (equal ndays 1)
-                  (and (null ndays) (equal 1 org-agenda-ndays)))
-              nil org-agenda-start-on-weekday))
-         (files (copy-sequence org-agenda-files))
-         (win (selected-window))
-         (today (time-to-days (current-time)))
-         (sd (or start-day today))
-         (start (if (or (null org-agenda-start-on-weekday)
-                        (< org-agenda-ndays 7))
-                    sd
-                  (let* ((nt (calendar-day-of-week
-                              (calendar-gregorian-from-absolute sd)))
-                         (n1 org-agenda-start-on-weekday)
-                         (d (- nt n1)))
-                    (- sd (+ (if (< d 0) 7 0) d)))))
-         (day-numbers (list start))
-         (inhibit-redisplay t)
-         s e rtn rtnall file date d start-pos end-pos todayp nd)
+	  (if (or (equal ndays 1)
+		  (and (null ndays) (equal 1 org-agenda-ndays)))
+	      nil org-agenda-start-on-weekday))
+	 (files (copy-sequence org-agenda-files))
+	 (win (selected-window))
+	 (today (time-to-days (current-time)))
+	 (sd (or start-day today))
+	 (start (if (or (null org-agenda-start-on-weekday)
+			(< org-agenda-ndays 7))
+		    sd
+		  (let* ((nt (calendar-day-of-week
+			      (calendar-gregorian-from-absolute sd)))
+			 (n1 org-agenda-start-on-weekday)
+			 (d (- nt n1)))
+		    (- sd (+ (if (< d 0) 7 0) d)))))
+	 (day-numbers (list start))
+	 (inhibit-redisplay t)
+	 s e rtn rtnall file date d start-pos end-pos todayp nd)
     (setq org-agenda-redo-command
-          (list 'org-agenda include-all start-day ndays))
+	  (list 'org-agenda (list 'quote include-all) start-day ndays))
     ;; Make the list of days
     (setq ndays (or ndays org-agenda-ndays)
-          nd ndays)
+	  nd ndays)
     (while (> ndays 1)
       (push (1+ (car day-numbers)) day-numbers)
       (setq ndays (1- ndays)))
     (setq day-numbers (nreverse day-numbers))
     (if (not (equal (current-buffer) (get-buffer org-agenda-buffer-name)))
-        (progn
-          (delete-other-windows)
-          (switch-to-buffer-other-window
-           (get-buffer-create org-agenda-buffer-name))))
+	(progn
+	  (delete-other-windows)
+	  (switch-to-buffer-other-window
+	   (get-buffer-create org-agenda-buffer-name))))
     (setq buffer-read-only nil)
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
     (set (make-local-variable 'starting-day) (car day-numbers))
     (set (make-local-variable 'include-all-loc) include-all)
     (when (and (or include-all org-agenda-include-all-todo)
-               (member today day-numbers))
+	       (member today day-numbers))
       (setq files org-agenda-files
-            rtnall nil)
+	    rtnall nil)
       (while (setq file (pop files))
-        (catch 'nextfile
-          (org-check-agenda-file file)
-          (setq date (calendar-gregorian-from-absolute today)
-                rtn (org-agenda-get-day-entries
-                     file date :todo))
-          (setq rtnall (append rtnall rtn))))
+	(catch 'nextfile
+	  (org-check-agenda-file file)
+	  (setq date (calendar-gregorian-from-absolute today)
+		rtn (org-agenda-get-day-entries
+		     file date :todo))
+	  (setq rtnall (append rtnall rtn))))
       (when rtnall
-        (insert "ALL CURRENTLY OPEN TODO ITEMS:\n")
-        (add-text-properties (point-min) (1- (point))
-                             (list 'face 'org-link))
-        (insert (org-finalize-agenda-entries rtnall) "\n")))
+	(insert "ALL CURRENTLY OPEN TODO ITEMS:\n")
+	(add-text-properties (point-min) (1- (point))
+			     (list 'face 'org-link))
+	(insert (org-finalize-agenda-entries rtnall) "\n")))
     (while (setq d (pop day-numbers))
       (setq date (calendar-gregorian-from-absolute d)
-            s (point))
+	    s (point))
       (if (or (setq todayp (= d today))
-              (and (not start-pos) (= d sd)))
-          (setq start-pos (point))
-        (if (and start-pos (not end-pos))
-            (setq end-pos (point))))
+	      (and (not start-pos) (= d sd)))
+	  (setq start-pos (point))
+	(if (and start-pos (not end-pos))
+	    (setq end-pos (point))))
       (setq files org-agenda-files
-            rtnall nil)
+	    rtnall nil)
       (while (setq file (pop files))
-        (catch 'nextfile
-          (org-check-agenda-file file)
-          (setq rtn (org-agenda-get-day-entries file date))
-          (setq rtnall (append rtnall rtn))))
+	(catch 'nextfile
+	  (org-check-agenda-file file)
+	  (setq rtn (org-agenda-get-day-entries file date))
+	  (setq rtnall (append rtnall rtn))))
       (if org-agenda-include-diary
-          (progn
-            (require 'diary-lib)
-            (setq rtn (org-get-entries-from-diary date))
-            (setq rtnall (append rtnall rtn))))
+	  (progn
+	    (require 'diary-lib)
+	    (setq rtn (org-get-entries-from-diary date))
+	    (setq rtnall (append rtnall rtn))))
       (if (or rtnall org-agenda-show-all-dates)
-          (progn
-            (insert (format "%-9s %2d %s %4d\n"
-                            (calendar-day-name date)
-                            (extract-calendar-day date)
-                            (calendar-month-name (extract-calendar-month date))
-                            (extract-calendar-year date)))
-            (put-text-property s (1- (point)) 'face
-                               'org-link)
-            (if rtnall (insert
-                        (org-finalize-agenda-entries ;; FIXME: condition needed
-                         (org-agenda-add-time-grid-maybe
-                          rtnall nd todayp))
-                        "\n"))
-            (put-text-property s (1- (point)) 'day d))))
+	  (progn
+	    (insert (format "%-9s %2d %s %4d\n"
+			    (calendar-day-name date)
+			    (extract-calendar-day date)
+			    (calendar-month-name (extract-calendar-month date))
+			    (extract-calendar-year date)))
+	    (put-text-property s (1- (point)) 'face
+			       'org-link)
+	    (if rtnall (insert
+			(org-finalize-agenda-entries ;; FIXME: condition needed
+			 (org-agenda-add-time-grid-maybe
+			  rtnall nd todayp))
+			"\n"))
+	    (put-text-property s (1- (point)) 'day d))))
     (goto-char (point-min))
     (setq buffer-read-only t)
     (if org-fit-agenda-window
-        (fit-window-to-buffer nil (/ (* (frame-height) 3) 4)
-                              (/ (frame-height) 2)))
+	(fit-window-to-buffer nil (/ (* (frame-height) 3) 4)
+			      (/ (frame-height) 2)))
     (unless (and (pos-visible-in-window-p (point-min))
-                 (pos-visible-in-window-p (point-max)))
+		 (pos-visible-in-window-p (point-max)))
       (goto-char (1- (point-max)))
       (recenter -1)
       (if (not (pos-visible-in-window-p (or start-pos 1)))
-          (progn
-            (goto-char (or start-pos 1))
-            (recenter 1))))
+	  (progn
+	    (goto-char (or start-pos 1))
+	    (recenter 1))))
     (goto-char (or start-pos 1))
     (if (not org-select-agenda-window) (select-window win))
     (message "")))
@@ -3832,12 +3842,12 @@
   ;; Could probably be fixed by explicitly going to the buffer.
   (when (not (file-exists-p file))
     (message "non-existent file %s.  [R]emove from agenda-files or [A]bort?"
-             file)
+	     file)
     (let ((r (downcase (read-char-exclusive))))
       (cond
        ((equal r ?r)
-        (org-remove-file file)
-        (throw 'nextfile t))
+	(org-remove-file file)
+	(throw 'nextfile t))
        (t (error "Abort"))))))
 
 (defun org-agenda-quit ()
@@ -3867,11 +3877,11 @@
   (interactive)
   (if (boundp 'starting-day)
       (let ((cmd (car org-agenda-redo-command))
-            (iall (nth 1 org-agenda-redo-command))
-            (nday (nth 3 org-agenda-redo-command)))
-        (eval (list cmd iall nil nday)))
+	    (iall (nth 1 org-agenda-redo-command))
+	    (nday (nth 3 org-agenda-redo-command)))
+	(eval (list cmd iall nil nday)))
     (goto-char (or (text-property-any (point-min) (point-max) 'org-today t)
-                   (point-min)))))
+		   (point-min)))))
 
 (defun org-agenda-later (arg)
   "Go forward in time by `org-agenda-ndays' days.
@@ -3880,7 +3890,7 @@
   (unless (boundp 'starting-day)
     (error "Not allowed"))
   (org-agenda (if (boundp 'include-all-loc) include-all-loc nil)
-              (+ starting-day (* arg org-agenda-ndays))))
+	      (+ starting-day (* arg org-agenda-ndays))))
 
 (defun org-agenda-earlier (arg)
   "Go back in time by `org-agenda-ndays' days.
@@ -3889,7 +3899,7 @@
   (unless (boundp 'starting-day)
     (error "Not allowed"))
   (org-agenda (if (boundp 'include-all-loc) include-all-loc nil)
-              (- starting-day (* arg org-agenda-ndays))))
+	      (- starting-day (* arg org-agenda-ndays))))
 
 (defun org-agenda-week-view ()
   "Switch to weekly view for agenda."
@@ -3898,20 +3908,20 @@
     (error "Not allowed"))
   (setq org-agenda-ndays 7)
   (org-agenda include-all-loc
-              (or (get-text-property (point) 'day)
-                  starting-day))
+	      (or (get-text-property (point) 'day)
+		  starting-day))
   (org-agenda-set-mode-name)
   (message "Switched to week view"))
 
 (defun org-agenda-day-view ()
-  "Switch to daily view for agenda."
+  "Switch to weekly view for agenda."
   (interactive)
   (unless (boundp 'starting-day)
     (error "Not allowed"))
   (setq org-agenda-ndays 1)
   (org-agenda include-all-loc
-              (or (get-text-property (point) 'day)
-                  starting-day))
+	      (or (get-text-property (point) 'day)
+		  starting-day))
   (org-agenda-set-mode-name)
   (message "Switched to day view"))
 
@@ -3922,8 +3932,8 @@
   (if (looking-at "^\\S-") (forward-char 1))
   (if (not (re-search-forward "^\\S-" nil t arg))
       (progn
-        (backward-char 1)
-        (error "No next date after this line in this buffer")))
+	(backward-char 1)
+	(error "No next date after this line in this buffer")))
   (goto-char (match-beginning 0)))
 
 (defun org-agenda-previous-date-line (&optional arg)
@@ -3936,12 +3946,12 @@
 ;; Initialize the highlight
 (defvar org-hl (funcall (if org-xemacs-p 'make-extent 'make-overlay) 1 1))
 (funcall (if org-xemacs-p 'set-extent-property 'overlay-put) org-hl
-         'face 'highlight)
+	 'face 'highlight)
 
 (defun org-highlight (begin end &optional buffer)
   "Highlight a region with overlay."
   (funcall (if org-xemacs-p 'set-extent-endpoints 'move-overlay)
-           org-hl begin end (or buffer (current-buffer))))
+	   org-hl begin end (or buffer (current-buffer))))
 
 (defun org-unhighlight ()
   "Detach overlay INDEX."
@@ -3954,41 +3964,41 @@
   (setq org-agenda-follow-mode (not org-agenda-follow-mode))
   (org-agenda-set-mode-name)
   (message "Follow mode is %s"
-           (if org-agenda-follow-mode "on" "off")))
+	   (if org-agenda-follow-mode "on" "off")))
 
 (defun org-agenda-toggle-diary ()
-  "Toggle diary inclusion in an agenda buffer."
+  "Toggle follow mode in an agenda buffer."
   (interactive)
   (setq org-agenda-include-diary (not org-agenda-include-diary))
   (org-agenda-redo)
   (org-agenda-set-mode-name)
   (message "Diary inclusion turned %s"
-           (if org-agenda-include-diary "on" "off")))
+	   (if org-agenda-include-diary "on" "off")))
 
 (defun org-agenda-toggle-time-grid ()
-  "Toggle time-grid in an agenda buffer."
+  "Toggle follow mode in an agenda buffer."
   (interactive)
   (setq org-agenda-use-time-grid (not org-agenda-use-time-grid))
   (org-agenda-redo)
   (org-agenda-set-mode-name)
   (message "Time-grid turned %s"
-           (if org-agenda-use-time-grid "on" "off")))
+	   (if org-agenda-use-time-grid "on" "off")))
 
 (defun org-agenda-set-mode-name ()
   "Set the mode name to indicate all the small mode settings."
   (setq mode-name
-        (concat "Org-Agenda"
-                (if (equal org-agenda-ndays 1) " Day"    "")
-                (if (equal org-agenda-ndays 7) " Week"   "")
-                (if org-agenda-follow-mode     " Follow" "")
-                (if org-agenda-include-diary   " Diary"  "")
-                (if org-agenda-use-time-grid   " Grid"   "")))
+	(concat "Org-Agenda"
+		(if (equal org-agenda-ndays 1) " Day"    "")
+		(if (equal org-agenda-ndays 7) " Week"   "")
+		(if org-agenda-follow-mode     " Follow" "")
+		(if org-agenda-include-diary   " Diary"  "")
+		(if org-agenda-use-time-grid   " Grid"   "")))
   (force-mode-line-update))
 
 (defun org-agenda-post-command-hook ()
   (and (eolp) (not (bolp)) (backward-char 1))
   (if (and org-agenda-follow-mode
-           (get-text-property (point) 'org-marker))
+	   (get-text-property (point) 'org-marker))
       (org-agenda-show)))
 
 (defvar org-disable-diary nil)          ;Dynamically-scoped param.
@@ -3996,55 +4006,55 @@
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
   (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
-         (diary-display-hook '(fancy-diary-display))
-         (list-diary-entries-hook
-          (cons 'org-diary-default-entry list-diary-entries-hook))
-         entries
-         (org-disable-diary t))
+	 (diary-display-hook '(fancy-diary-display))
+	 (list-diary-entries-hook
+	  (cons 'org-diary-default-entry list-diary-entries-hook))
+	 entries
+	 (org-disable-diary t))
     (save-excursion
       (save-window-excursion
-        (list-diary-entries date 1)))
+	(list-diary-entries date 1)))
     (if (not (get-buffer fancy-diary-buffer))
-        (setq entries nil)
+	(setq entries nil)
       (with-current-buffer fancy-diary-buffer
-        (setq buffer-read-only nil)
-        (if (= (point-max) 1)
-            ;; No entries
-            (setq entries nil)
-          ;; Omit the date and other unnecessary stuff
-          (org-agenda-cleanup-fancy-diary)
-          ;; Add prefix to each line and extend the text properties
-          (if (= (point-max) 1)
-              (setq entries nil)
-            (setq entries (buffer-substring (point-min) (- (point-max) 1)))))
-        (set-buffer-modified-p nil)
-        (kill-buffer fancy-diary-buffer)))
+	(setq buffer-read-only nil)
+	(if (= (point-max) 1)
+	    ;; No entries
+	    (setq entries nil)
+	  ;; Omit the date and other unnecessary stuff
+	  (org-agenda-cleanup-fancy-diary)
+	  ;; Add prefix to each line and extend the text properties
+	  (if (= (point-max) 1)
+	      (setq entries nil)
+	    (setq entries (buffer-substring (point-min) (- (point-max) 1)))))
+	(set-buffer-modified-p nil)
+	(kill-buffer fancy-diary-buffer)))
     (when entries
       (setq entries (org-split-string entries "\n"))
       (setq entries
-            (mapcar
-             (lambda (x)
-               (setq x (org-format-agenda-item "" x "Diary" 'time))
-               ;; Extend the text properties to the beginning of the line
-               (add-text-properties
-                0 (length x)
-                (text-properties-at (1- (length x)) x)
-                x)
-               x)
-             entries)))))
+	    (mapcar
+	     (lambda (x)
+	       (setq x (org-format-agenda-item "" x "Diary" 'time))
+	       ;; Extend the text properties to the beginning of the line
+	       (add-text-properties
+		0 (length x)
+		(text-properties-at (1- (length x)) x)
+		x)
+	       x)
+	     entries)))))
 
 (defun org-agenda-cleanup-fancy-diary ()
-  "Remove unwanted stuff in buffer created by `fancy-diary-display'.
+  "Remove unwanted stuff in buffer created by fancy-diary-display.
 This gets rid of the date, the underline under the date, and
 the dummy entry installed by `org-mode' to ensure non-empty diary for each
-date.  It also removes lines that contain only whitespace."
+date.  Itt also removes lines that contain only whitespace."
   (goto-char (point-min))
   (if (looking-at ".*?:[ \t]*")
       (progn
-        (replace-match "")
-        (re-search-forward "\n=+$" nil t)
-        (replace-match "")
-        (while (re-search-backward "^ +\n?" nil t) (replace-match "")))
+	(replace-match "")
+	(re-search-forward "\n=+$" nil t)
+	(replace-match "")
+	(while (re-search-backward "^ +\n?" nil t) (replace-match "")))
     (re-search-forward "\n=+$" nil t)
     (delete-region (point-min) (min (point-max) (1+ (match-end 0)))))
   (goto-char (point-min))
@@ -4061,19 +4071,19 @@
   '(defadvice add-to-diary-list (before org-mark-diary-entry activate)
      "Make the position visible."
      (if (and org-disable-diary  ;; called from org-agenda
-              (stringp string)
-              (buffer-file-name))
-         (add-text-properties
-          0 (length string)
-          (list 'mouse-face 'highlight
-                'keymap org-agenda-keymap
-                'help-echo
-                (format
-                 "mouse-2 or RET jump to diary file %s"
-                 (abbreviate-file-name (buffer-file-name)))
-                'org-agenda-diary-link t
-                'org-marker (org-agenda-new-marker (point-at-bol)))
-          string))))
+	      (stringp string)
+	      (buffer-file-name))
+	 (add-text-properties
+	  0 (length string)
+	  (list 'mouse-face 'highlight
+		'keymap org-agenda-keymap
+		'help-echo
+		(format
+		 "mouse-2 or RET jump to diary file %s"
+		 (abbreviate-file-name (buffer-file-name)))
+		'org-agenda-diary-link t
+		'org-marker (org-agenda-new-marker (point-at-bol)))
+	  string))))
 
 (defun org-diary-default-entry ()
   "Add a dummy entry to the diary.
@@ -4093,25 +4103,25 @@
   (interactive)
   (catch 'exit
     (let* ((file (or file (buffer-file-name)
-                     (if (interactive-p)
-                         (error "Buffer is not visiting a file")
-                       (throw 'exit nil))))
-           (true-file (file-truename file))
-           (afile (abbreviate-file-name file))
-           (present (delq nil (mapcar
-                               (lambda (x)
-                                 (equal true-file (file-truename x)))
-                               org-agenda-files))))
+		     (if (interactive-p)
+			 (error "Buffer is not visiting a file")
+		       (throw 'exit nil))))
+	   (true-file (file-truename file))
+	   (afile (abbreviate-file-name file))
+	   (present (delq nil (mapcar
+			       (lambda (x)
+				 (equal true-file (file-truename x)))
+			       org-agenda-files))))
       (if (not present)
-          (progn
-            (setq org-agenda-files
-                  (cons afile org-agenda-files))
-            ;; Make sure custom.el does not end up with Org-mode
-            (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode))
-              (customize-save-variable 'org-agenda-files org-agenda-files))
-            (org-install-agenda-files-menu)
-            (message "Added file: %s" afile))
-        (message "File was already in list: %s" afile)))))
+	  (progn
+	    (setq org-agenda-files
+		  (cons afile org-agenda-files))
+	    ;; Make sure custom.el does not end up with Org-mode
+	    (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode))
+	      (customize-save-variable 'org-agenda-files org-agenda-files))
+	    (org-install-agenda-files-menu)
+	    (message "Added file: %s" afile))
+	(message "File was already in list: %s" afile)))))
 
 (defun org-remove-file (&optional file)
   "Remove current file from the list of files in variable `org-agenda-files'.
@@ -4119,20 +4129,20 @@
 Optional argument FILE means, use this file instead of the current."
   (interactive)
   (let* ((file (or file (buffer-file-name)))
-         (true-file (file-truename file))
-         (afile (abbreviate-file-name file))
-         (files (delq nil (mapcar
-                           (lambda (x)
-                             (if (equal true-file
-                                        (file-truename x))
-                                 nil x))
-                           org-agenda-files))))
+	 (true-file (file-truename file))
+	 (afile (abbreviate-file-name file))
+	 (files (delq nil (mapcar
+			   (lambda (x)
+			     (if (equal true-file
+					(file-truename x))
+				 nil x))
+			   org-agenda-files))))
     (if (not (= (length files) (length org-agenda-files)))
-        (progn
-          (setq org-agenda-files files)
-          (customize-save-variable 'org-agenda-files org-agenda-files)
-          (org-install-agenda-files-menu)
-          (message "Removed file: %s" afile))
+	(progn
+	  (setq org-agenda-files files)
+	  (customize-save-variable 'org-agenda-files org-agenda-files)
+	  (org-install-agenda-files-menu)
+	  (message "Removed file: %s" afile))
       (message "File was not in list: %s" afile))))
 
 (defun org-file-menu-entry (file)
@@ -4145,22 +4155,22 @@
 sure that TODAY is included in the list."
   (let (dates date day day1 day2 ts1 ts2)
     (if force-today
-        (setq dates (list (time-to-days (current-time)))))
+	(setq dates (list (time-to-days (current-time)))))
     (save-excursion
       (goto-char beg)
       (while (re-search-forward org-ts-regexp end t)
-        (setq day (time-to-days (org-time-string-to-time
-                                 (substring (match-string 1) 0 10))))
-        (or (memq day dates) (push day dates)))
+	(setq day (time-to-days (org-time-string-to-time
+				 (substring (match-string 1) 0 10))))
+	(or (memq day dates) (push day dates)))
       (unless no-ranges
-        (goto-char beg)
-        (while (re-search-forward org-tr-regexp end t)
-          (setq ts1 (substring (match-string 1) 0 10)
-                ts2 (substring (match-string 2) 0 10)
-                day1 (time-to-days (org-time-string-to-time ts1))
-                day2 (time-to-days (org-time-string-to-time ts2)))
-          (while (< (setq day1 (1+ day1)) day2)
-            (or (memq day1 dates) (push day1 dates)))))
+	(goto-char beg)
+	(while (re-search-forward org-tr-regexp end t)
+	  (setq ts1 (substring (match-string 1) 0 10)
+		ts2 (substring (match-string 2) 0 10)
+		day1 (time-to-days (org-time-string-to-time ts1))
+		day2 (time-to-days (org-time-string-to-time ts2)))
+	  (while (< (setq day1 (1+ day1)) day2)
+	    (or (memq day1 dates) (push day1 dates)))))
       (sort dates '<))))
 
 ;;;###autoload
@@ -4172,22 +4182,22 @@
 items should be listed.  The following arguments are allowed:
 
    :timestamp    List the headlines of items containing a date stamp or
-                 date range matching the selected date.  Deadlines will
-                 also be listed, on the expiration day.
+		 date range matching the selected date.  Deadlines will
+		 also be listed, on the expiration day.
 
    :deadline     List any deadlines past due, or due within
-                 `org-deadline-warning-days'.  The listing occurs only
-                 in the diary for *today*, not at any other date.  If
-                 an entry is marked DONE, it is no longer listed.
+		 `org-deadline-warning-days'.  The listing occurs only
+		 in the diary for *today*, not at any other date.  If
+		 an entry is marked DONE, it is no longer listed.
 
    :scheduled    List all items which are scheduled for the given date.
-                 The diary for *today* also contains items which were
-                 scheduled earlier and are not yet marked DONE.
+		 The diary for *today* also contains items which were
+		 scheduled earlier and are not yet marked DONE.
 
    :todo         List all TODO items from the org-file.  This may be a
-                 long list - so this is not turned on by default.
-                 Like deadlines, these entries only show up in the
-                 diary for *today*, not at any other date.
+		 long list - so this is not turned on by default.
+		 Like deadlines, these entries only show up in the
+		 diary for *today*, not at any other date.
 
 The call in the diary file should look like this:
 
@@ -4211,9 +4221,9 @@
   (org-compile-prefix-format org-agenda-prefix-format)
   (setq args (or args '(:deadline :scheduled :timestamp)))
   (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry))
-                    (list entry)
-                  org-agenda-files))
-         file rtn results)
+		    (list entry)
+		  org-agenda-files))
+	 file rtn results)
     ;; If this is called during org-agenda, don't return any entries to
     ;; the calendar.  Org Agenda will list these entries itself.
     (if org-disable-diary (setq files nil))
@@ -4230,53 +4240,53 @@
 the documentation of `org-diary'."
   (setq args (or args '(:deadline :scheduled :timestamp)))
   (let* ((org-startup-with-deadline-check nil)
-         (org-startup-folded nil)
-         (buffer (if (file-exists-p file)
-                     (org-get-agenda-file-buffer file)
-                   (error "No such file %s" file)))
-         arg results rtn)
+	 (org-startup-folded nil)
+	 (buffer (if (file-exists-p file)
+		     (org-get-agenda-file-buffer file)
+		   (error "No such file %s" file)))
+	 arg results rtn)
     (if (not buffer)
-        ;; If file does not exist, make sure an error message ends up in diary
-        (list (format "ORG-AGENDA-ERROR: No such org-file %s" file))
+	;; If file does not exist, make sure an error message ends up in diary
+	(list (format "ORG-AGENDA-ERROR: No such org-file %s" file))
       (with-current-buffer buffer
-        (unless (eq major-mode 'org-mode)
-          (error "Agenda file %s is not in `org-mode'" file))
-        (let ((case-fold-search nil))
-          (save-excursion
-            (save-restriction
-              (if org-respect-restriction
-                  (if (org-region-active-p)
-                      ;; Respect a region to restrict search
-                      (narrow-to-region (region-beginning) (region-end)))
-                ;; If we work for the calendar or many files,
-                ;; get rid of any restriction
-                (widen))
-              ;; The way we repeatedly append to `results' makes it O(n^2) :-(
-              (while (setq arg (pop args))
-                (cond
-                 ((and (eq arg :todo)
-                       (equal date (calendar-current-date)))
-                  (setq rtn (org-agenda-get-todos))
-                  (setq results (append results rtn)))
-                 ((eq arg :timestamp)
-                  (setq rtn (org-agenda-get-blocks))
-                  (setq results (append results rtn))
-                  (setq rtn (org-agenda-get-timestamps))
-                  (setq results (append results rtn)))
-                 ((eq arg :scheduled)
-                  (setq rtn (org-agenda-get-scheduled))
-                  (setq results (append results rtn)))
-                 ((and (eq arg :deadline)
-                       (equal date (calendar-current-date)))
-                  (setq rtn (org-agenda-get-deadlines))
-                  (setq results (append results rtn))))))))
-        results))))
+	(unless (eq major-mode 'org-mode)
+	  (error "Agenda file %s is not in `org-mode'" file))
+	(let ((case-fold-search nil))
+	  (save-excursion
+	    (save-restriction
+	      (if org-respect-restriction
+		  (if (org-region-active-p)
+		      ;; Respect a region to restrict search
+		      (narrow-to-region (region-beginning) (region-end)))
+		;; If we work for the calendar or many files,
+		;; get rid of any restriction
+		(widen))
+	      ;; The way we repeatedly append to `results' makes it O(n^2) :-(
+	      (while (setq arg (pop args))
+		(cond
+		 ((and (eq arg :todo)
+		       (equal date (calendar-current-date)))
+		  (setq rtn (org-agenda-get-todos))
+		  (setq results (append results rtn)))
+		 ((eq arg :timestamp)
+		  (setq rtn (org-agenda-get-blocks))
+		  (setq results (append results rtn))
+		  (setq rtn (org-agenda-get-timestamps))
+		  (setq results (append results rtn)))
+		 ((eq arg :scheduled)
+		  (setq rtn (org-agenda-get-scheduled))
+		  (setq results (append results rtn)))
+		 ((and (eq arg :deadline)
+		       (equal date (calendar-current-date)))
+		  (setq rtn (org-agenda-get-deadlines))
+		  (setq results (append results rtn))))))))
+	results))))
 
 (defun org-entry-is-done-p ()
   "Is the current entry marked DONE?"
   (save-excursion
     (and (re-search-backward "[\r\n]\\*" nil t)
-         (looking-at org-nl-done-regexp))))
+	 (looking-at org-nl-done-regexp))))
 
 (defun org-at-date-range-p ()
   "Is the cursor inside a date range?"
@@ -4284,273 +4294,273 @@
   (save-excursion
     (catch 'exit
       (let ((pos (point)))
-        (skip-chars-backward "^<\r\n")
-        (skip-chars-backward "<")
-        (and (looking-at org-tr-regexp)
-             (>= (match-end 0) pos)
-             (throw 'exit t))
-        (skip-chars-backward "^<\r\n")
-        (skip-chars-backward "<")
-        (and (looking-at org-tr-regexp)
-             (>= (match-end 0) pos)
-             (throw 'exit t)))
+	(skip-chars-backward "^<\r\n")
+	(skip-chars-backward "<")
+	(and (looking-at org-tr-regexp)
+	     (>= (match-end 0) pos)
+	     (throw 'exit t))
+	(skip-chars-backward "^<\r\n")
+	(skip-chars-backward "<")
+	(and (looking-at org-tr-regexp)
+	     (>= (match-end 0) pos)
+	     (throw 'exit t)))
       nil)))
 
 (defun org-agenda-get-todos ()
   "Return the TODO information for agenda display."
   (let* ((props (list 'face nil
-                      'done-face 'org-done
-                      'mouse-face 'highlight
-                      'keymap org-agenda-keymap
-                      'help-echo
-                      (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name (buffer-file-name)))))
-         (regexp (concat "[\n\r]\\*+ *\\(" org-not-done-regexp
-                         "[^\n\r]*\\)"))
-         marker priority
-         ee txt)
+		      'done-face 'org-done
+		      'mouse-face 'highlight
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name (buffer-file-name)))))
+	 (regexp (concat "[\n\r]\\*+ *\\(" org-not-done-regexp
+			 "[^\n\r]*\\)"))
+	 marker priority
+	 ee txt)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (goto-char (match-beginning 1))
       (setq marker (org-agenda-new-marker (point-at-bol))
-            txt (org-format-agenda-item "" (match-string 1))
-            priority
-            (+ (org-get-priority txt)
-               (if org-todo-kwd-priority-p
-                         (- org-todo-kwd-max-priority -2
-                            (length
-                             (member (match-string 2) org-todo-keywords)))
-                       1)))
+	    txt (org-format-agenda-item "" (match-string 1))
+	    priority
+	    (+ (org-get-priority txt)
+	       (if org-todo-kwd-priority-p
+			 (- org-todo-kwd-max-priority -2
+			    (length
+			     (member (match-string 2) org-todo-keywords)))
+		       1)))
       (add-text-properties
        0 (length txt) (append (list 'org-marker marker 'org-hd-marker marker
-                                    'priority priority)
-                              props)
+				    'priority priority)
+			      props)
        txt)
       (push txt ee)
       (goto-char (match-end 1)))
     (nreverse ee)))
 
 (defconst org-agenda-no-heading-message
-  "No heading for this item in buffer or region.")
+  "No heading for this item in buffer or region")
 
 (defun org-agenda-get-timestamps ()
   "Return the date stamp information for agenda display."
   (let* ((props (list 'face nil
-                      'mouse-face 'highlight
-                      'keymap org-agenda-keymap
-                      'help-echo
-                      (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name (buffer-file-name)))))
-         (regexp (regexp-quote
-                  (substring
-                   (format-time-string
-                    (car org-time-stamp-formats)
-                    (apply 'encode-time  ; DATE bound by calendar
-                           (list 0 0 0 (nth 1 date) (car date) (nth 2 date))))
-                   0 11)))
-         marker hdmarker deadlinep scheduledp donep tmp priority
-         ee txt timestr)
+		      'mouse-face 'highlight
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name (buffer-file-name)))))
+	 (regexp (regexp-quote
+		  (substring
+		   (format-time-string
+		    (car org-time-stamp-formats)
+		    (apply 'encode-time  ; DATE bound by calendar
+			   (list 0 0 0 (nth 1 date) (car date) (nth 2 date))))
+		   0 11)))
+	 marker hdmarker deadlinep scheduledp donep tmp priority
+	 ee txt timestr)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (if (not (save-match-data (org-at-date-range-p)))
-          (progn
-            (setq marker (org-agenda-new-marker (match-beginning 0))
-                  tmp (buffer-substring (max (point-min)
-                                             (- (match-beginning 0)
-                                                org-ds-keyword-length))
-                                        (match-beginning 0))
-                  timestr (buffer-substring (match-beginning 0) (point-at-eol))
-                  deadlinep (string-match org-deadline-regexp tmp)
-                  scheduledp (string-match org-scheduled-regexp tmp)
-                  donep (org-entry-is-done-p))
-            (if (string-match ">" timestr)
-                ;; substring should only run to end of time stamp
-                (setq timestr (substring timestr 0 (match-end 0))))
-            (save-excursion
-              (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
-                  (progn
-                    (goto-char (match-end 1))
-                    (setq hdmarker (org-agenda-new-marker))
-                    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
-                    (setq txt (org-format-agenda-item
-                               (format "%s%s"
-                                       (if deadlinep  "Deadline:  " "")
-                                       (if scheduledp "Scheduled: " ""))
-                               (match-string 1) nil timestr)))
-                (setq txt org-agenda-no-heading-message))
-              (setq priority (org-get-priority txt))
-              (add-text-properties
-               0 (length txt) (append (list 'org-marker marker
-                                            'org-hd-marker hdmarker) props)
-               txt)
-              (if deadlinep
-                  (add-text-properties
-                   0 (length txt)
-                   (list 'face
-                         (if donep 'org-done 'org-warning)
-                         'undone-face 'org-warning
-                         'done-face 'org-done
-                         'priority (+ 100 priority))
-                   txt)
-                (if scheduledp
-                    (add-text-properties
-                     0 (length txt)
-                     (list 'face 'org-scheduled-today
-                           'undone-face 'org-scheduled-today
-                           'done-face 'org-done
-                           priority (+ 99 priority))
-                     txt)
-                  (add-text-properties
-                   0 (length txt)
-                   (list 'priority priority) txt)))
-              (push txt ee))
-            (outline-next-heading))))
+	  (progn
+	    (setq marker (org-agenda-new-marker (match-beginning 0))
+		  tmp (buffer-substring (max (point-min)
+					     (- (match-beginning 0)
+						org-ds-keyword-length))
+					(match-beginning 0))
+		  timestr (buffer-substring (match-beginning 0) (point-at-eol))
+		  deadlinep (string-match org-deadline-regexp tmp)
+		  scheduledp (string-match org-scheduled-regexp tmp)
+		  donep (org-entry-is-done-p))
+	    (if (string-match ">" timestr)
+		;; substring should only run to end of time stamp
+		(setq timestr (substring timestr 0 (match-end 0))))
+	    (save-excursion
+	      (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+		  (progn
+		    (goto-char (match-end 1))
+		    (setq hdmarker (org-agenda-new-marker))
+		    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+		    (setq txt (org-format-agenda-item
+			       (format "%s%s"
+				       (if deadlinep  "Deadline:  " "")
+				       (if scheduledp "Scheduled: " ""))
+			       (match-string 1) nil timestr)))
+		(setq txt org-agenda-no-heading-message))
+	      (setq priority (org-get-priority txt))
+	      (add-text-properties
+	       0 (length txt) (append (list 'org-marker marker
+					    'org-hd-marker hdmarker) props)
+	       txt)
+	      (if deadlinep
+		  (add-text-properties
+		   0 (length txt)
+		   (list 'face
+			 (if donep 'org-done 'org-warning)
+			 'undone-face 'org-warning
+			 'done-face 'org-done
+			 'priority (+ 100 priority))
+		   txt)
+		(if scheduledp
+		    (add-text-properties
+		     0 (length txt)
+		     (list 'face 'org-scheduled-today
+			   'undone-face 'org-scheduled-today
+			   'done-face 'org-done
+			   priority (+ 99 priority))
+		     txt)
+		  (add-text-properties
+		   0 (length txt)
+		   (list 'priority priority) txt)))
+	      (push txt ee))
+	    (outline-next-heading))))
     (nreverse ee)))
 
 (defun org-agenda-get-deadlines ()
   "Return the deadline information for agenda display."
   (let* ((wdays org-deadline-warning-days)
-         (props (list 'mouse-face 'highlight
-                      'keymap org-agenda-keymap
-                      'help-echo
-                      (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name (buffer-file-name)))))
-         (regexp org-deadline-time-regexp)
-         (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
-         (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
-         d2 diff pos pos1
-         ee txt head)
+	 (props (list 'mouse-face 'highlight
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name (buffer-file-name)))))
+	 (regexp org-deadline-time-regexp)
+	 (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
+	 (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
+	 d2 diff pos pos1
+	 ee txt head)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (setq pos (1- (match-beginning 1))
-            d2 (time-to-days
-                (org-time-string-to-time (match-string 1)))
-            diff (- d2 d1))
+	    d2 (time-to-days
+		(org-time-string-to-time (match-string 1)))
+	    diff (- d2 d1))
       ;; When to show a deadline in the calendar:
       ;; If the expiration is within wdays warning time.
       ;; Past-due deadlines are only shown on the current date
       (if (and (< diff wdays) todayp (not (= diff 0)))
-          (save-excursion
-            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
-                (progn
-                  (goto-char (match-end 0))
-                  (setq pos1 (match-end 1))
-                  (setq head (buffer-substring-no-properties
-                              (point)
-                              (progn (skip-chars-forward "^\r\n")
-                                     (point))))
-                  (if (string-match org-looking-at-done-regexp head)
-                      (setq txt nil)
-                    (setq txt (org-format-agenda-item
-                               (format "In %3d d.: " diff) head))))
-              (setq txt org-agenda-no-heading-message))
-            (when txt
-              (add-text-properties
-               0 (length txt)
-               (append
-                (list 'org-marker (org-agenda-new-marker pos)
-                      'org-hd-marker (org-agenda-new-marker pos1)
-                      'priority (+ (- 10 diff) (org-get-priority txt))
-                      'face (cond ((<= diff 0) 'org-warning)
-                                  ((<= diff 5) 'org-scheduled-previously)
-                                  (t nil))
-                      'undone-face (cond
-                                    ((<= diff 0) 'org-warning)
-                                    ((<= diff 5) 'org-scheduled-previously)
-                                    (t nil))
-                      'done-face 'org-done)
-                props)
-               txt)
-              (push txt ee)))))
+	  (save-excursion
+	    (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+		(progn
+		  (goto-char (match-end 0))
+		  (setq pos1 (match-end 1))
+		  (setq head (buffer-substring-no-properties
+			      (point)
+			      (progn (skip-chars-forward "^\r\n")
+				     (point))))
+		  (if (string-match org-looking-at-done-regexp head)
+		      (setq txt nil)
+		    (setq txt (org-format-agenda-item
+			       (format "In %3d d.: " diff) head))))
+	      (setq txt org-agenda-no-heading-message))
+	    (when txt
+	      (add-text-properties
+	       0 (length txt)
+	       (append
+		(list 'org-marker (org-agenda-new-marker pos)
+		      'org-hd-marker (org-agenda-new-marker pos1)
+		      'priority (+ (- 10 diff) (org-get-priority txt))
+		      'face (cond ((<= diff 0) 'org-warning)
+				  ((<= diff 5) 'org-scheduled-previously)
+				  (t nil))
+		      'undone-face (cond
+				    ((<= diff 0) 'org-warning)
+				    ((<= diff 5) 'org-scheduled-previously)
+				    (t nil))
+		      'done-face 'org-done)
+		props)
+	       txt)
+	      (push txt ee)))))
     ee))
 
 (defun org-agenda-get-scheduled ()
   "Return the scheduled information for agenda display."
   (let* ((props (list 'face 'org-scheduled-previously
-                      'undone-face 'org-scheduled-previously
-                      'done-face 'org-done
-                      'mouse-face 'highlight
-                      'keymap org-agenda-keymap
-                      'help-echo
-                      (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name (buffer-file-name)))))
-         (regexp org-scheduled-time-regexp)
-         (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
-         (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
-         d2 diff pos pos1
-         ee txt head)
+		      'undone-face 'org-scheduled-previously
+		      'done-face 'org-done
+		      'mouse-face 'highlight
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name (buffer-file-name)))))
+	 (regexp org-scheduled-time-regexp)
+	 (todayp (equal date (calendar-current-date))) ; DATE bound by calendar
+	 (d1 (calendar-absolute-from-gregorian date))  ; DATE bound by calendar
+	 d2 diff pos pos1
+	 ee txt head)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (setq pos (1- (match-beginning 1))
-            d2 (time-to-days
-                (org-time-string-to-time (match-string 1)))
-            diff (- d2 d1))
+	    d2 (time-to-days
+		(org-time-string-to-time (match-string 1)))
+	    diff (- d2 d1))
       ;; When to show a scheduled item in the calendar:
       ;; If it is on or past the date.
       (if (and (< diff 0) todayp)
-          (save-excursion
-            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
-                (progn
-                  (goto-char (match-end 0))
-                  (setq pos1 (match-end 1))
-                  (setq head (buffer-substring-no-properties
-                              (point)
-                              (progn (skip-chars-forward "^\r\n") (point))))
-                  (if (string-match org-looking-at-done-regexp head)
-                      (setq txt nil)
-                    (setq txt (org-format-agenda-item
-                               (format "Sched.%2dx: " (- 1 diff)) head))))
-              (setq txt org-agenda-no-heading-message))
-            (when txt
-              (add-text-properties
-               0 (length txt)
-               (append (list 'org-marker (org-agenda-new-marker pos)
-                             'org-hd-marker (org-agenda-new-marker pos1)
-                             'priority (+ (- 5 diff) (org-get-priority txt)))
-                       props) txt)
-              (push txt ee)))))
+	  (save-excursion
+	    (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+		(progn
+		  (goto-char (match-end 0))
+		  (setq pos1 (match-end 1))
+		  (setq head (buffer-substring-no-properties
+			      (point)
+			      (progn (skip-chars-forward "^\r\n") (point))))
+		  (if (string-match org-looking-at-done-regexp head)
+		      (setq txt nil)
+		    (setq txt (org-format-agenda-item
+			       (format "Sched.%2dx: " (- 1 diff)) head))))
+	      (setq txt org-agenda-no-heading-message))
+	    (when txt
+	      (add-text-properties
+	       0 (length txt)
+	       (append (list 'org-marker (org-agenda-new-marker pos)
+			     'org-hd-marker (org-agenda-new-marker pos1)
+			     'priority (+ (- 5 diff) (org-get-priority txt)))
+		       props) txt)
+	      (push txt ee)))))
     ee))
 
 (defun org-agenda-get-blocks ()
   "Return the date-range information for agenda display."
   (let* ((props (list 'face nil
-                      'mouse-face 'highlight
-                      'keymap org-agenda-keymap
-                      'help-echo
-                      (format "mouse-2 or RET jump to org file %s"
-                              (abbreviate-file-name (buffer-file-name)))))
-         (regexp org-tr-regexp)
-         (d0 (calendar-absolute-from-gregorian date))
-         marker hdmarker ee txt d1 d2 s1 s2 timestr)
+		      'mouse-face 'highlight
+		      'keymap org-agenda-keymap
+		      'help-echo
+		      (format "mouse-2 or RET jump to org file %s"
+			      (abbreviate-file-name (buffer-file-name)))))
+	 (regexp org-tr-regexp)
+	 (d0 (calendar-absolute-from-gregorian date))
+	 marker hdmarker ee txt d1 d2 s1 s2 timestr)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (setq timestr (match-string 0)
-            s1 (match-string 1)
-            s2 (match-string 2)
-            d1 (time-to-days (org-time-string-to-time s1))
-            d2 (time-to-days (org-time-string-to-time s2)))
+	    s1 (match-string 1)
+	    s2 (match-string 2)
+	    d1 (time-to-days (org-time-string-to-time s1))
+	    d2 (time-to-days (org-time-string-to-time s2)))
       (if (and (> (- d0 d1) -1) (> (- d2 d0) -1))
-          ;; Only allow days between the limits, because the normal
-          ;; date stamps will catch the limits.
-          (save-excursion
-            (setq marker (org-agenda-new-marker (point)))
-            (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
-                (progn
-                  (setq hdmarker (org-agenda-new-marker (match-end 1)))
-                  (goto-char (match-end 1))
-                  (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
-                  (setq txt (org-format-agenda-item
-                             (format (if (= d1 d2) "" "(%d/%d): ")
-                                     (1+ (- d0 d1)) (1+ (- d2 d1)))
-                             (match-string 1) nil (if (= d0 d1) timestr))))
-              (setq txt org-agenda-no-heading-message))
-            (add-text-properties
-             0 (length txt) (append (list 'org-marker marker
-                                          'org-hd-marker hdmarker
-                                          'priority (org-get-priority txt))
-                                    props)
-             txt)
-            (push txt ee)))
+	  ;; Only allow days between the limits, because the normal
+	  ;; date stamps will catch the limits.
+	  (save-excursion
+	    (setq marker (org-agenda-new-marker (point)))
+	    (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+		(progn
+		  (setq hdmarker (org-agenda-new-marker (match-end 1)))
+		  (goto-char (match-end 1))
+		  (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+		  (setq txt (org-format-agenda-item
+			     (format (if (= d1 d2) "" "(%d/%d): ")
+				     (1+ (- d0 d1)) (1+ (- d2 d1)))
+			     (match-string 1) nil (if (= d0 d1) timestr))))
+	      (setq txt org-agenda-no-heading-message))
+	    (add-text-properties
+	     0 (length txt) (append (list 'org-marker marker
+					  'org-hd-marker hdmarker
+					  'priority (org-get-priority txt))
+				    props)
+	     txt)
+	    (push txt ee)))
       (outline-next-heading))
     ;; Sort the entries by expiration date.
     (nreverse ee)))
@@ -4605,87 +4615,87 @@
     ;; Diary entries sometimes have extra whitespace at the beginning
     (if (string-match "^ +" txt) (setq txt (replace-match "" nil nil txt)))
     (let* ((category (or category
-                         org-category
-                         (if (buffer-file-name)
-                             (file-name-sans-extension
-                              (file-name-nondirectory (buffer-file-name)))
-                           "")))
-           time              ;; needed for the eval of the prefix format
-           (ts (if dotime (concat (if (stringp dotime) dotime "") txt)))
-           (time-of-day (and dotime (org-get-time-of-day ts)))
-           stamp plain s0 s1 s2 rtn)
+			 org-category
+			 (if (buffer-file-name)
+			     (file-name-sans-extension
+			      (file-name-nondirectory (buffer-file-name)))
+			   "")))
+	   time              ;; needed for the eval of the prefix format
+	   (ts (if dotime (concat (if (stringp dotime) dotime "") txt)))
+	   (time-of-day (and dotime (org-get-time-of-day ts)))
+	   stamp plain s0 s1 s2 rtn)
       (when (and dotime time-of-day org-prefix-has-time)
-        ;; Extract starting and ending time and move them to prefix
-        (when (or (setq stamp (string-match org-stamp-time-of-day-regexp ts))
-                  (setq plain (string-match org-plain-time-of-day-regexp ts)))
-          (setq s0 (match-string 0 ts)
-                s1 (match-string (if plain 1 2) ts)
-                s2 (match-string (if plain 8 4) ts))
-
-          ;; If the times are in TXT (not in DOTIMES), and the prefix will list
-          ;; them, we might want to remove them there to avoid duplication.
-          ;; The user can turn this off with a variable.
-          (if (and org-agenda-remove-times-when-in-prefix (or stamp plain)
-                   (string-match (concat (regexp-quote s0) " *") txt)
-                   (if (eq org-agenda-remove-times-when-in-prefix 'beg)
-                       (= (match-beginning 0) 0)
-                     t))
-              (setq txt (replace-match "" nil nil txt))))
-        ;; Normalize the time(s) to 24 hour
-        (if s1 (setq s1 (org-get-time-of-day s1 'string)))
-        (if s2 (setq s2 (org-get-time-of-day s2 'string))))
+	;; Extract starting and ending time and move them to prefix
+	(when (or (setq stamp (string-match org-stamp-time-of-day-regexp ts))
+		  (setq plain (string-match org-plain-time-of-day-regexp ts)))
+	  (setq s0 (match-string 0 ts)
+		s1 (match-string (if plain 1 2) ts)
+		s2 (match-string (if plain 8 4) ts))
+
+	  ;; If the times are in TXT (not in DOTIMES), and the prefix will list
+	  ;; them, we might want to remove them there to avoid duplication.
+	  ;; The user can turn this off with a variable.
+	  (if (and org-agenda-remove-times-when-in-prefix (or stamp plain)
+		   (string-match (concat (regexp-quote s0) " *") txt)
+		   (if (eq org-agenda-remove-times-when-in-prefix 'beg)
+		       (= (match-beginning 0) 0)
+		     t))
+	      (setq txt (replace-match "" nil nil txt))))
+	;; Normalize the time(s) to 24 hour
+	(if s1 (setq s1 (org-get-time-of-day s1 'string)))
+	(if s2 (setq s2 (org-get-time-of-day s2 'string))))
 
       ;; Create the final string
       (if noprefix
-          (setq rtn txt)
-        ;; Prepare the variables needed in the eval of the compiled format
-        (setq time (cond (s2 (concat s1 "-" s2))
-                         (s1 (concat s1 "......"))
-                         (t ""))
-              extra (or extra "")
-              category (if (symbolp category) (symbol-name category) category))
-        ;; Evaluate the compiled format
-        (setq rtn (concat (eval org-prefix-format-compiled) txt)))
+	  (setq rtn txt)
+	;; Prepare the variables needed in the eval of the compiled format
+	(setq time (cond (s2 (concat s1 "-" s2))
+			 (s1 (concat s1 "......"))
+			 (t ""))
+	      extra (or extra "")
+	      category (if (symbolp category) (symbol-name category) category))
+	;; Evaluate the compiled format
+	(setq rtn (concat (eval org-prefix-format-compiled) txt)))
 
       ;; And finally add the text properties
       (add-text-properties
        0 (length rtn) (list 'category (downcase category)
-                            'prefix-length (- (length rtn) (length txt))
-                            'time-of-day time-of-day
-                            'dotime dotime)
+			    'prefix-length (- (length rtn) (length txt))
+			    'time-of-day time-of-day
+			    'dotime dotime)
        rtn)
       rtn)))
 
 (defun org-agenda-add-time-grid-maybe (list ndays todayp)
   (catch 'exit
     (cond ((not org-agenda-use-time-grid) (throw 'exit list))
-          ((and todayp (member 'today (car org-agenda-time-grid))))
-          ((and (= ndays 1) (member 'daily (car org-agenda-time-grid))))
-          ((member 'weekly (car org-agenda-time-grid)))
-          (t (throw 'exit list)))
+	  ((and todayp (member 'today (car org-agenda-time-grid))))
+	  ((and (= ndays 1) (member 'daily (car org-agenda-time-grid))))
+	  ((member 'weekly (car org-agenda-time-grid)))
+	  (t (throw 'exit list)))
     (let* ((have (delq nil (mapcar
-                            (lambda (x) (get-text-property 1 'time-of-day x))
-                            list)))
-           (string (nth 1 org-agenda-time-grid))
-           (gridtimes (nth 2 org-agenda-time-grid))
-           (req (car org-agenda-time-grid))
-           (remove (member 'remove-match req))
-           new time)
+			    (lambda (x) (get-text-property 1 'time-of-day x))
+			    list)))
+	   (string (nth 1 org-agenda-time-grid))
+	   (gridtimes (nth 2 org-agenda-time-grid))
+	   (req (car org-agenda-time-grid))
+	   (remove (member 'remove-match req))
+	   new time)
       (if (and (member 'require-timed req) (not have))
-          ;; don't show empty grid
-          (throw 'exit list))
+	  ;; don't show empty grid
+	  (throw 'exit list))
       (while (setq time (pop gridtimes))
-        (unless (and remove (member time have))
-          (setq time (int-to-string time))
-          (push (org-format-agenda-item
-                 nil string "" ;; FIXME: put a category?
-                 (concat (substring time 0 -2) ":" (substring time -2)))
-                new)
-          (put-text-property
-           1 (length (car new)) 'face 'org-time-grid (car new))))
+	(unless (and remove (member time have))
+	  (setq time (int-to-string time))
+	  (push (org-format-agenda-item
+		 nil string "" ;; FIXME: put a category?
+		 (concat (substring time 0 -2) ":" (substring time -2)))
+		new)
+	  (put-text-property
+	   1 (length (car new)) 'face 'org-time-grid (car new))))
       (if (member 'time-up org-agenda-sorting-strategy)
-          (append new list)
-        (append list new)))))
+	  (append new list)
+	(append list new)))))
 
 (defun org-compile-prefix-format (format)
   "Compile the prefix format into a Lisp form that can be evaluated.
@@ -4694,20 +4704,20 @@
   (setq org-prefix-has-time nil)
   (let ((start 0) varform vars var (s format) c f opt)
     (while (string-match "%\\(\\?\\)?\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([cts]\\)"
-                         s start)
+			 s start)
       (setq var (cdr (assoc (match-string 4 s)
-                            '(("c" . category) ("t" . time) ("s" . extra))))
-            c (or (match-string 3 s) "")
-            opt (match-beginning 1)
-            start (1+ (match-beginning 0)))
+			    '(("c" . category) ("t" . time) ("s" . extra))))
+	    c (or (match-string 3 s) "")
+	    opt (match-beginning 1)
+	    start (1+ (match-beginning 0)))
       (if (equal var 'time) (setq org-prefix-has-time t))
       (setq f (concat "%" (match-string 2 s) "s"))
       (if opt
-          (setq varform
-                `(if (equal "" ,var)
-                     ""
-                   (format ,f (if (equal "" ,var) "" (concat ,var ,c)))))
-        (setq varform `(format ,f (if (equal ,var "") "" (concat ,var ,c)))))
+	  (setq varform
+		`(if (equal "" ,var)
+		     ""
+		   (format ,f (if (equal "" ,var) "" (concat ,var ,c)))))
+	(setq varform `(format ,f (if (equal ,var "") "" (concat ,var ,c)))))
       (setq s (replace-match "%s" t nil s))
       (push varform vars))
     (setq vars (nreverse vars))
@@ -4727,14 +4737,14 @@
       (string-match
        "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s))
      (let* ((t0 (+ (* 100
-                      (+ (string-to-number (match-string 1 s))
-                         (if (and (match-beginning 4)
-                                  (equal (downcase (match-string 4 s)) "pm"))
-                             12 0)))
-                   (if (match-beginning 3)
-                       (string-to-number (match-string 3 s))
-                     0)))
-            (t1 (concat " " (int-to-string t0))))
+		      (+ (string-to-number (match-string 1 s))
+			 (if (and (match-beginning 4)
+				  (equal (downcase (match-string 4 s)) "pm"))
+			     12 0)))
+		   (if (match-beginning 3)
+		       (string-to-number (match-string 3 s))
+		     0)))
+	    (t1 (concat " " (int-to-string t0))))
        (if string (concat (substring t1 -4 -2) ":" (substring t1 -2)) t0)))))
 
 (defun org-finalize-agenda-entries (list)
@@ -4742,43 +4752,43 @@
   (mapconcat 'identity (sort list 'org-entries-lessp) "\n"))
 
 (defsubst org-cmp-priority (a b)
-  "Compare the priorities of strings A and B."
+  "Compare the priorities of string a and b."
   (let ((pa (or (get-text-property 1 'priority a) 0))
-        (pb (or (get-text-property 1 'priority b) 0)))
+	(pb (or (get-text-property 1 'priority b) 0)))
     (cond ((> pa pb) +1)
-          ((< pa pb) -1)
-          (t nil))))
+	  ((< pa pb) -1)
+	  (t nil))))
 
 (defsubst org-cmp-category (a b)
-  "Compare the string values of categories of strings A and B."
+  "Compare the string values of categories of strings a and b."
   (let ((ca (or (get-text-property 1 'category a) ""))
-        (cb (or (get-text-property 1 'category b) "")))
+	(cb (or (get-text-property 1 'category b) "")))
     (cond ((string-lessp ca cb) -1)
-          ((string-lessp cb ca) +1)
-          (t nil))))
+	  ((string-lessp cb ca) +1)
+	  (t nil))))
 
 (defsubst org-cmp-time (a b)
-  "Compare the time-of-day values of strings A and B."
+  "Compare the time-of-day values of strings a and b."
   (let* ((def (if org-sort-agenda-notime-is-late 2401 -1))
-         (ta (or (get-text-property 1 'time-of-day a) def))
-         (tb (or (get-text-property 1 'time-of-day b) def)))
+	 (ta (or (get-text-property 1 'time-of-day a) def))
+	 (tb (or (get-text-property 1 'time-of-day b) def)))
     (cond ((< ta tb) -1)
-          ((< tb ta) +1)
-          (t nil))))
+	  ((< tb ta) +1)
+	  (t nil))))
 
 (defun org-entries-lessp (a b)
   "Predicate for sorting agenda entries."
   ;; The following variables will be used when the form is evaluated.
   (let* ((time-up (org-cmp-time a b))
-         (time-down (if time-up (- time-up) nil))
-         (priority-up (org-cmp-priority a b))
-         (priority-down (if priority-up (- priority-up) nil))
-         (category-up (org-cmp-category a b))
-         (category-down (if category-up (- category-up) nil))
-         (category-keep (if category-up +1 nil)))  ; FIXME +1 or -1?
+	 (time-down (if time-up (- time-up) nil))
+	 (priority-up (org-cmp-priority a b))
+	 (priority-down (if priority-up (- priority-up) nil))
+	 (category-up (org-cmp-category a b))
+	 (category-down (if category-up (- category-up) nil))
+	 (category-keep (if category-up +1 nil)))  ; FIXME +1 or -1?
     (cdr (assoc
-          (eval (cons 'or org-agenda-sorting-strategy))
-          '((-1 . t) (1 . nil) (nil . nil))))))
+	  (eval (cons 'or org-agenda-sorting-strategy))
+	  '((-1 . t) (1 . nil) (nil . nil))))))
 
 (defun org-agenda-show-priority ()
   "Show the priority of the current item.
@@ -4792,26 +4802,26 @@
   "Go to the Org-mode file which contains the item at point."
   (interactive)
   (let* ((marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker)))
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
     (switch-to-buffer-other-window buffer)
     (widen)
     (goto-char pos)
     (when (eq major-mode 'org-mode)
       (org-show-hidden-entry)
       (save-excursion
-        (and (outline-next-heading)
-             (org-flag-heading nil)))) ; show the next heading
+	(and (outline-next-heading)
+	     (org-flag-heading nil)))) ; show the next heading
     (and highlight (org-highlight (point-at-bol) (point-at-eol)))))
 
 (defun org-agenda-switch-to ()
   "Go to the Org-mode file which contains the item at point."
   (interactive)
   (let* ((marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker)))
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
     (switch-to-buffer buffer)
     (delete-other-windows)
     (widen)
@@ -4819,8 +4829,8 @@
     (when (eq major-mode 'org-mode)
       (org-show-hidden-entry)
       (save-excursion
-        (and (outline-next-heading)
-             (org-flag-heading nil))))))  ; show the next heading
+	(and (outline-next-heading)
+	     (org-flag-heading nil))))))  ; show the next heading
 
 (defun org-agenda-goto-mouse (ev)
   "Go to the Org-mode file which contains the item at the mouse click."
@@ -4868,33 +4878,33 @@
   (interactive)
   (org-agenda-check-no-diary)
   (let* ((col (current-column))
-         (marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker))
-         (hdmarker (get-text-property (point) 'org-hd-marker))
-         (buffer-read-only nil)
-         newhead)
+	 (marker (or (get-text-property (point) 'org-marker)
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker))
+	 (hdmarker (get-text-property (point) 'org-hd-marker))
+	 (buffer-read-only nil)
+	 newhead)
     (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (org-show-hidden-entry)
       (save-excursion
-        (and (outline-next-heading)
-             (org-flag-heading nil)))   ; show the next heading
+	(and (outline-next-heading)
+	     (org-flag-heading nil)))   ; show the next heading
       (org-todo)
       (forward-char 1)
       (setq newhead (org-get-heading))
       (save-excursion
-        (org-back-to-heading)
-        (move-marker org-last-heading-marker (point))))
+	(org-back-to-heading)
+	(move-marker org-last-heading-marker (point))))
     (beginning-of-line 1)
     (save-excursion
       (org-agenda-change-all-lines newhead hdmarker 'fixface))
     (move-to-column col)))
 
 (defun org-agenda-change-all-lines (newhead hdmarker &optional fixface)
-  "Change all lines in the agenda buffer which match HDMARKER.
+  "Change all lines in the agenda buffer which match hdmarker.
 The new content of the line will be NEWHEAD (as modified by
 `org-format-agenda-item').  HDMARKER is checked with
 `equal' against all `org-hd-marker' text properties in the file.
@@ -4906,30 +4916,30 @@
       (goto-char (point-max))
       (beginning-of-line 1)
       (while (not finish)
-        (setq finish (bobp))
-        (when (and (setq m (get-text-property (point) 'org-hd-marker))
-                   (equal m hdmarker))
-          (setq props (text-properties-at (point))
-                dotime (get-text-property (point) 'dotime)
-                new (org-format-agenda-item "x" newhead "x" dotime 'noprefix)
-                pl (get-text-property (point) 'prefix-length)
-                undone-face (get-text-property (point) 'undone-face)
-                done-face (get-text-property (point) 'done-face))
-          (move-to-column pl)
-          (if (looking-at ".*")
-              (progn
-                (replace-match new t t)
-                (beginning-of-line 1)
-                (add-text-properties (point-at-bol) (point-at-eol) props)
-                (if fixface
-                    (add-text-properties
-                     (point-at-bol) (point-at-eol)
-                     (list 'face
-                           (if org-last-todo-state-is-todo
-                               undone-face done-face))))
-                (beginning-of-line 1))
-            (error "Line update did not work")))
-        (beginning-of-line 0)))))
+	(setq finish (bobp))
+	(when (and (setq m (get-text-property (point) 'org-hd-marker))
+		   (equal m hdmarker))
+	  (setq props (text-properties-at (point))
+		dotime (get-text-property (point) 'dotime)
+		new (org-format-agenda-item "x" newhead "x" dotime 'noprefix)
+		pl (get-text-property (point) 'prefix-length)
+		undone-face (get-text-property (point) 'undone-face)
+		done-face (get-text-property (point) 'done-face))
+	  (move-to-column pl)
+	  (if (looking-at ".*")
+	      (progn
+		(replace-match new t t)
+		(beginning-of-line 1)
+		(add-text-properties (point-at-bol) (point-at-eol) props)
+		(if fixface
+		    (add-text-properties
+		     (point-at-bol) (point-at-eol)
+		     (list 'face
+			   (if org-last-todo-state-is-todo
+			       undone-face done-face))))
+		(beginning-of-line 1))
+	    (error "Line update did not work")))
+	(beginning-of-line 0)))))
 
 (defun org-agenda-priority-up ()
   "Increase the priority of line at point, also in Org-mode file."
@@ -4948,19 +4958,19 @@
   (interactive)
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker))
-         (hdmarker (get-text-property (point) 'org-hd-marker))
-         (buffer-read-only nil)
-         newhead)
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker))
+	 (hdmarker (get-text-property (point) 'org-hd-marker))
+	 (buffer-read-only nil)
+	 newhead)
     (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (org-show-hidden-entry)
       (save-excursion
-        (and (outline-next-heading)
-             (org-flag-heading nil)))   ; show the next heading
+	(and (outline-next-heading)
+	     (org-flag-heading nil)))   ; show the next heading
       (funcall 'org-priority force-direction)
       (end-of-line 1)
       (setq newhead (org-get-heading)))
@@ -4972,14 +4982,14 @@
   (interactive "p")
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker)))
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
     (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (if (not (org-at-timestamp-p))
-          (error "Cannot find time stamp"))
+	  (error "Cannot find time stamp"))
       (org-timestamp-change arg (or what 'day))
       (message "Time stamp changed to %s" org-last-changed-timestamp))))
 
@@ -4995,14 +5005,14 @@
   (interactive "P")
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
-                     (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker)))
+		     (org-agenda-error)))
+	 (buffer (marker-buffer marker))
+	 (pos (marker-position marker)))
     (with-current-buffer buffer
       (widen)
       (goto-char pos)
       (if (not (org-at-timestamp-p))
-          (error "Cannot find time stamp"))
+	  (error "Cannot find time stamp"))
       (org-time-stamp arg)
       (message "Time stamp changed to %s" org-last-changed-timestamp))))
 
@@ -5010,49 +5020,49 @@
   "Return the heading of the current entry, without the stars."
   (save-excursion
     (if (and (re-search-backward "[\r\n]\\*" nil t)
-             (looking-at "[\r\n]\\*+[ \t]+\\(.*\\)"))
-        (match-string 1)
+	     (looking-at "[\r\n]\\*+[ \t]+\\(.*\\)"))
+	(match-string 1)
       "")))
 
 (defun org-agenda-diary-entry ()
   "Make a diary entry, like the `i' command from the calendar.
-All the standard commands work: block, weekly etc."
+All the standard commands work: block, weekly etc"
   (interactive)
   (require 'diary-lib)
   (let* ((char (progn
-                 (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
-                 (read-char-exclusive)))
-         (cmd (cdr (assoc char
-                          '((?d . insert-diary-entry)
-                            (?w . insert-weekly-diary-entry)
-                            (?m . insert-monthly-diary-entry)
-                            (?y . insert-yearly-diary-entry)
-                            (?a . insert-anniversary-diary-entry)
-                            (?b . insert-block-diary-entry)
-                            (?c . insert-cyclic-diary-entry)))))
-         (oldf (symbol-function 'calendar-cursor-to-date))
-         (point (point))
-         (mark (or (mark t) (point))))
+		 (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
+		 (read-char-exclusive)))
+	 (cmd (cdr (assoc char
+			  '((?d . insert-diary-entry)
+			    (?w . insert-weekly-diary-entry)
+			    (?m . insert-monthly-diary-entry)
+			    (?y . insert-yearly-diary-entry)
+			    (?a . insert-anniversary-diary-entry)
+			    (?b . insert-block-diary-entry)
+			    (?c . insert-cyclic-diary-entry)))))
+	 (oldf (symbol-function 'calendar-cursor-to-date))
+	 (point (point))
+	 (mark (or (mark t) (point))))
     (unless cmd
       (error "No command associated with <%c>" char))
     (unless (and (get-text-property point 'day)
-                 (or (not (equal ?b char))
-                     (get-text-property mark 'day)))
+		 (or (not (equal ?b char))
+		     (get-text-property mark 'day)))
       (error "Don't know which date to use for diary entry"))
     ;; We implement this by hacking the `calendar-cursor-to-date' function
     ;; and the `calendar-mark-ring' variable.  Saves a lot of code.
     (let ((calendar-mark-ring
-           (list (calendar-gregorian-from-absolute
-                  (or (get-text-property mark 'day)
-                      (get-text-property point 'day))))))
+	   (list (calendar-gregorian-from-absolute
+		  (or (get-text-property mark 'day)
+		      (get-text-property point 'day))))))
       (unwind-protect
-          (progn
-            (fset 'calendar-cursor-to-date
-                  (lambda (&optional error)
-                    (calendar-gregorian-from-absolute
-                     (get-text-property point 'day))))
-            (call-interactively cmd))
-        (fset 'calendar-cursor-to-date oldf)))))
+	  (progn
+	    (fset 'calendar-cursor-to-date
+		  (lambda (&optional error)
+		    (calendar-gregorian-from-absolute
+		     (get-text-property point 'day))))
+	    (call-interactively cmd))
+	(fset 'calendar-cursor-to-date oldf)))))
 
 
 (defun org-agenda-execute-calendar-command (cmd)
@@ -5062,20 +5072,20 @@
   (unless (get-text-property (point) 'day)
     (error "Don't know which date to use for calendar command"))
   (let* ((oldf (symbol-function 'calendar-cursor-to-date))
-         (point (point))
-         (date (calendar-gregorian-from-absolute
-                (get-text-property point 'day)))
-         (displayed-day (extract-calendar-day date))
-         (displayed-month (extract-calendar-month date))
-         (displayed-year (extract-calendar-year date)))
+	 (point (point))
+	 (date (calendar-gregorian-from-absolute
+		(get-text-property point 'day)))
+	 (displayed-day (extract-calendar-day date))
+	 (displayed-month (extract-calendar-month date))
+	 (displayed-year (extract-calendar-year date)))
       (unwind-protect
-          (progn
-            (fset 'calendar-cursor-to-date
-                  (lambda (&optional error)
-                    (calendar-gregorian-from-absolute
-                     (get-text-property point 'day))))
-            (call-interactively cmd))
-        (fset 'calendar-cursor-to-date oldf))))
+	  (progn
+	    (fset 'calendar-cursor-to-date
+		  (lambda (&optional error)
+		    (calendar-gregorian-from-absolute
+		     (get-text-property point 'day))))
+	    (call-interactively cmd))
+	(fset 'calendar-cursor-to-date oldf))))
 
 (defun org-agenda-phases-of-moon ()
   "Display the phases of the moon for the 3 months around the cursor date."
@@ -5094,17 +5104,17 @@
 argument, latitude and longitude will be prompted for."
   (interactive "P")
   (let ((calendar-longitude (if arg nil calendar-longitude))
-        (calendar-latitude  (if arg nil calendar-latitude))
-        (calendar-location-name
-         (if arg "the given coordinates" calendar-location-name)))
+	(calendar-latitude  (if arg nil calendar-latitude))
+	(calendar-location-name
+	 (if arg "the given coordinates" calendar-location-name)))
     (org-agenda-execute-calendar-command 'calendar-sunrise-sunset)))
 
 (defun org-agenda-goto-calendar ()
   "Open the Emacs calendar with the date at the cursor."
   (interactive)
   (let* ((day (or (get-text-property (point) 'day)
-                  (error "Don't know which date to open in calendar")))
-         (date (calendar-gregorian-from-absolute day)))
+		  (error "Don't know which date to open in calendar")))
+	 (date (calendar-gregorian-from-absolute day)))
     (calendar)
     (calendar-goto-date date)))
 
@@ -5113,30 +5123,30 @@
 This is a command that has to be installed in `calendar-mode-map'."
   (interactive)
   (org-agenda nil (calendar-absolute-from-gregorian
-                   (calendar-cursor-to-date))))
+		   (calendar-cursor-to-date))))
 
 (defun org-agenda-convert-date ()
   (interactive)
   (let ((day (get-text-property (point) 'day))
-        date s)
+	date s)
     (unless day
       (error "Don't know which date to convert"))
     (setq date (calendar-gregorian-from-absolute day))
     (setq s (concat
-             "Gregorian:  " (calendar-date-string date) "\n"
-             "ISO:        " (calendar-iso-date-string date) "\n"
-             "Day of Yr:  " (calendar-day-of-year-string date) "\n"
-             "Julian:     " (calendar-julian-date-string date) "\n"
-             "Astron. JD: " (calendar-astro-date-string date)
-             " (Julian date number at noon UTC)\n"
-             "Hebrew:     " (calendar-hebrew-date-string date) " (until sunset)\n"
-             "Islamic:    " (calendar-islamic-date-string date) " (until sunset)\n"
-             "French:     " (calendar-french-date-string date) "\n"
-             "Mayan:      " (calendar-mayan-date-string date) "\n"
-             "Coptic:     " (calendar-coptic-date-string date) "\n"
-             "Ethiopic:   " (calendar-ethiopic-date-string date) "\n"
-             "Persian:    " (calendar-persian-date-string date) "\n"
-             "Chinese:    " (calendar-chinese-date-string date) "\n"))
+	     "Gregorian:  " (calendar-date-string date) "\n"
+	     "ISO:        " (calendar-iso-date-string date) "\n"
+	     "Day of Yr:  " (calendar-day-of-year-string date) "\n"
+	     "Julian:     " (calendar-julian-date-string date) "\n"
+	     "Astron. JD: " (calendar-astro-date-string date)
+	     " (Julian date number at noon UTC)\n"
+	     "Hebrew:     " (calendar-hebrew-date-string date) " (until sunset)\n"
+	     "Islamic:    " (calendar-islamic-date-string date) " (until sunset)\n"
+	     "French:     " (calendar-french-date-string date) "\n"
+	     "Mayan:      " (calendar-mayan-date-string date) "\n"
+	     "Coptic:     " (calendar-coptic-date-string date) "\n"
+	     "Ethiopic:   " (calendar-ethiopic-date-string date) "\n"
+	     "Persian:    " (calendar-persian-date-string date) "\n"
+	     "Chinese:    " (calendar-chinese-date-string date) "\n"))
     (with-output-to-temp-buffer "*Dates*"
       (princ s))
     (fit-window-to-buffer (get-buffer-window "*Dates*"))))
@@ -5164,88 +5174,88 @@
   (interactive "P")
   (if (org-at-timestamp-p)
       (org-agenda nil (time-to-days (org-time-string-to-time
-                                     (substring (match-string 1) 0 10)))
-                  1)
+				     (substring (match-string 1) 0 10)))
+		  1)
     (let (type path line (pos (point)))
       (save-excursion
-        (skip-chars-backward
-         (concat (if org-allow-space-in-links "^" "^ ")
-                 org-non-link-chars))
-        (if (re-search-forward
-             org-link-regexp
-             (save-excursion
-               (condition-case nil
-                   (progn (outline-end-of-subtree) (max pos (point)))
-                 (error (end-of-line 1) (point))))
-             t)
-            (setq type (match-string 1)
-                  path (match-string 2)))
-        (unless path
-          (error "No link found"))
-        ;; Remove any trailing spaces in path
-        (if (string-match " +\\'" path)
-            (setq path (replace-match "" t t path)))
-
-        (cond
-
-         ((string= type "file")
-          (if (string-match ":\\([0-9]+\\)\\'" path)
-              (setq line (string-to-number (match-string 1 path))
-                    path (substring path 0 (match-beginning 0))))
-          (org-open-file path in-emacs line))
-
-         ((string= type "news")
-          (org-follow-gnus-link path))
-
-         ((string= type "bbdb")
-          (org-follow-bbdb-link path))
-
-         ((string= type "gnus")
-          (let (group article)
-            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-                (error "Error in Gnus link"))
-            (setq group (match-string 1 path)
-                  article (match-string 3 path))
-            (org-follow-gnus-link group article)))
-
-         ((string= type "vm")
-          (let (folder article)
-            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-                (error "Error in VM link"))
-            (setq folder (match-string 1 path)
-                  article (match-string 3 path))
-            ;; in-emacs is the prefix arg, will be interpreted as read-only
-            (org-follow-vm-link folder article in-emacs)))
-
-         ((string= type "wl")
-          (let (folder article)
-            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-                (error "Error in Wanderlust link"))
-            (setq folder (match-string 1 path)
-                  article (match-string 3 path))
-            (org-follow-wl-link folder article)))
-
-         ((string= type "rmail")
-          (let (folder article)
-            (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
-                (error "Error in RMAIL link"))
-            (setq folder (match-string 1 path)
-                  article (match-string 3 path))
-            (org-follow-rmail-link folder article)))
-
-         ((string= type "shell")
-          (let ((cmd path))
-            (while (string-match "@{" cmd)
-              (setq cmd (replace-match "<" t t cmd)))
-            (while (string-match "@}" cmd)
-              (setq cmd (replace-match ">" t t cmd)))
-            (if (or (not org-confirm-shell-links)
-                    (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd)))
-                (shell-command cmd)
-              (error "Abort"))))
-
-         (t
-          (browse-url-at-point)))))))
+	(skip-chars-backward
+	 (concat (if org-allow-space-in-links "^" "^ ")
+		 org-non-link-chars))
+	(if (re-search-forward
+	     org-link-regexp
+	     (save-excursion
+	       (condition-case nil
+		   (progn (outline-end-of-subtree) (max pos (point)))
+		 (error (end-of-line 1) (point))))
+	     t)
+	    (setq type (match-string 1)
+		  path (match-string 2)))
+	(unless path
+	  (error "No link found"))
+	;; Remove any trailing spaces in path
+	(if (string-match " +\\'" path)
+	    (setq path (replace-match "" t t path)))
+
+	(cond
+
+	 ((string= type "file")
+	  (if (string-match ":\\([0-9]+\\)\\'" path)
+	      (setq line (string-to-number (match-string 1 path))
+		    path (substring path 0 (match-beginning 0))))
+	  (org-open-file path in-emacs line))
+
+	 ((string= type "news")
+	  (org-follow-gnus-link path))
+
+	 ((string= type "bbdb")
+	  (org-follow-bbdb-link path))
+
+	 ((string= type "gnus")
+	  (let (group article)
+	    (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+		(error "Error in Gnus link"))
+	    (setq group (match-string 1 path)
+		  article (match-string 3 path))
+	    (org-follow-gnus-link group article)))
+
+	 ((string= type "vm")
+	  (let (folder article)
+	    (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+		(error "Error in VM link"))
+	    (setq folder (match-string 1 path)
+		  article (match-string 3 path))
+	    ;; in-emacs is the prefix arg, will be interpreted as read-only
+	    (org-follow-vm-link folder article in-emacs)))
+
+	 ((string= type "wl")
+	  (let (folder article)
+	    (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+		(error "Error in Wanderlust link"))
+	    (setq folder (match-string 1 path)
+		  article (match-string 3 path))
+	    (org-follow-wl-link folder article)))
+
+	 ((string= type "rmail")
+	  (let (folder article)
+	    (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path))
+		(error "Error in RMAIL link"))
+	    (setq folder (match-string 1 path)
+		  article (match-string 3 path))
+	    (org-follow-rmail-link folder article)))
+
+	 ((string= type "shell")
+	  (let ((cmd path))
+	    (while (string-match "@{" cmd)
+	      (setq cmd (replace-match "<" t t cmd)))
+	    (while (string-match "@}" cmd)
+	      (setq cmd (replace-match ">" t t cmd)))
+	    (if (or (not org-confirm-shell-links)
+		    (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd)))
+		(shell-command cmd)
+	      (error "Abort"))))
+
+	 (t
+	  (browse-url-at-point)))))))
 
 (defun org-follow-bbdb-link (name)
   "Follow a BBDB link to NAME."
@@ -5267,8 +5277,8 @@
       ;; General match including network address and notes
       (bbdb name nil)
       (when (= 0 (buffer-size (get-buffer "*BBDB*")))
-        (delete-window (get-buffer-window "*BBDB*"))
-        (error "No matching BBDB record")))))
+	(delete-window (get-buffer-window "*BBDB*"))
+	(error "No matching BBDB record")))))
 
 (defun org-follow-gnus-link (&optional group article)
   "Follow a Gnus link to GROUP and ARTICLE."
@@ -5277,11 +5287,11 @@
   (if group (gnus-fetch-group group))
   (if article
       (or (gnus-summary-goto-article article nil 'force)
-          (if (fboundp 'gnus-summary-insert-cached-articles)
-              (progn
-                (gnus-summary-insert-cached-articles)
-                (gnus-summary-goto-article article nil 'force))
-            (message "Message could not be found.")))))
+	  (if (fboundp 'gnus-summary-insert-cached-articles)
+	      (progn
+		(gnus-summary-insert-cached-articles)
+		(gnus-summary-goto-article article nil 'force))
+	    (message "Message could not be found.")))))
 
 (defun org-follow-vm-link (&optional folder article readonly)
   "Follow a VM link to FOLDER and ARTICLE."
@@ -5289,18 +5299,18 @@
   (if (string-match "^//\\([a-zA-Z]+@\\)?\\([^:]+\\):\\(.*\\)" folder)
       ;; ange-ftp or efs or tramp access
       (let ((user (or (match-string 1 folder) (user-login-name)))
-            (host (match-string 2 folder))
-            (file (match-string 3 folder)))
-        (cond
-         ((featurep 'tramp)
-          ;; use tramp to access the file
-          (if org-xemacs-p
-              (setq folder (format "[%s@%s]%s" user host file))
-            (setq folder (format "/%s@%s:%s" user host file))))
-         (t
-          ;; use ange-ftp or efs
-          (require (if org-xemacs-p 'efs 'ange-ftp))
-          (setq folder (format "/%s@%s:%s" user host file))))))
+	    (host (match-string 2 folder))
+	    (file (match-string 3 folder)))
+	(cond
+	 ((featurep 'tramp)
+	  ;; use tramp to access the file
+	  (if org-xemacs-p
+	      (setq folder (format "[%s@%s]%s" user host file))
+	    (setq folder (format "/%s@%s:%s" user host file))))
+	 (t
+	  ;; use ange-ftp or efs
+	  (require (if org-xemacs-p 'efs 'ange-ftp))
+	  (setq folder (format "/%s@%s:%s" user host file))))))
   (when folder
     (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly)
     (sit-for 0.1)
@@ -5308,14 +5318,14 @@
       (vm-select-folder-buffer)
       (widen)
       (let ((case-fold-search t))
-        (goto-char (point-min))
-        (if (not (re-search-forward
-                  (concat "^" "message-id: *" (regexp-quote article))))
-            (error "Could not find the specified message in this folder"))
-        (vm-isearch-update)
-        (vm-isearch-narrow)
-        (vm-beginning-of-message)
-        (vm-summarize)))))
+	(goto-char (point-min))
+	(if (not (re-search-forward
+		  (concat "^" "message-id: *" (regexp-quote article))))
+	    (error "Could not find the specified message in this folder"))
+	(vm-isearch-update)
+	(vm-isearch-narrow)
+	(vm-beginning-of-message)
+	(vm-summarize)))))
 
 (defun org-follow-wl-link (folder article)
   "Follow a Wanderlust link to FOLDER and ARTICLE."
@@ -5328,21 +5338,21 @@
   (let (message-number)
     (save-excursion
       (save-window-excursion
-        (rmail (if (string= folder "RMAIL") rmail-file-name folder))
-        (setq message-number
-              (save-restriction
-                (widen)
-                (goto-char (point-max))
-                (if (re-search-backward
-                     (concat "^Message-ID:\\s-+" (regexp-quote
-                                                  (or article "")))
-                     nil t)
-                    (rmail-what-message))))))
+	(rmail (if (string= folder "RMAIL") rmail-file-name folder))
+	(setq message-number
+	      (save-restriction
+		(widen)
+		(goto-char (point-max))
+		(if (re-search-backward
+		     (concat "^Message-ID:\\s-+" (regexp-quote
+						  (or article "")))
+		     nil t)
+		    (rmail-what-message))))))
     (if message-number
-        (progn
-          (rmail (if (string= folder "RMAIL") rmail-file-name folder))
-          (rmail-show-message message-number)
-          message-number)
+	(progn
+	  (rmail (if (string= folder "RMAIL") rmail-file-name folder))
+	  (rmail-show-message message-number)
+	  message-number)
       (error "Message not found"))))
 
 (defun org-open-file (path &optional in-emacs line)
@@ -5354,27 +5364,27 @@
 With optional argument IN-EMACS, Emacs will visit the file.
 If the file does not exist, an error is thrown."
   (let* ((file (convert-standard-filename (org-expand-file-name path)))
-         (dfile (downcase file))
-         ext cmd apps)
+	 (dfile (downcase file))
+	 ext cmd apps)
     (if (and (not (file-exists-p file))
-             (not org-open-non-existing-files))
-        (error "No such file: %s" file))
+	     (not org-open-non-existing-files))
+	(error "No such file: %s" file))
     (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
-        (setq ext (match-string 1 dfile))
+	(setq ext (match-string 1 dfile))
       (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
-          (setq ext (match-string 1 dfile))))
+	  (setq ext (match-string 1 dfile))))
     (setq apps (append org-file-apps (org-default-apps)))
     (if in-emacs
-        (setq cmd 'emacs)
+	(setq cmd 'emacs)
       (setq cmd (or (cdr (assoc ext apps))
-                    (cdr (assoc t apps)))))
+		    (cdr (assoc t apps)))))
     (cond
      ((and (stringp cmd) (not (string-match "^\\s-*$" cmd)))
       (setq cmd (format cmd (concat "\"" file "\"")))
       (save-window-excursion
-        (shell-command (concat cmd " & &"))))
+	(shell-command (concat cmd " & &"))))
      ((or (stringp cmd)
-          (eq cmd 'emacs))
+	  (eq cmd 'emacs))
       (funcall (cdr (assq 'file org-link-frame-setup)) file)
       (if line (goto-line line)))
      ((consp cmd)
@@ -5388,9 +5398,7 @@
     org-file-apps-defaults-macosx)
    ((eq system-type 'windows-nt)
     org-file-apps-defaults-windowsnt)
-   ((eq system-type 'linux)
-    org-file-apps-defaults-linux)
-   (t org-file-apps-defaults-linux)))
+   (t org-file-apps-defaults-gnu)))
 
 (defun org-expand-file-name (path)
   "Replace special path abbreviations and expand the file name."
@@ -5417,120 +5425,120 @@
 
      ((eq major-mode 'bbdb-mode)
       (setq cpltxt (concat
-                    "bbdb:"
-                    (or (bbdb-record-name (bbdb-current-record))
-                        (bbdb-record-company (bbdb-current-record))))
-            link (org-make-link cpltxt)))
+		    "bbdb:"
+		    (or (bbdb-record-name (bbdb-current-record))
+			(bbdb-record-company (bbdb-current-record))))
+	    link (org-make-link cpltxt)))
 
      ((eq major-mode 'calendar-mode)
       (let ((cd (calendar-cursor-to-date)))
-        (setq link
-              (format-time-string
-               (car org-time-stamp-formats)
-               (apply 'encode-time
-                      (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd)
-                            nil nil nil))))))
+	(setq link
+	      (format-time-string
+	       (car org-time-stamp-formats)
+	       (apply 'encode-time
+		      (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd)
+			    nil nil nil))))))
 
      ((or (eq major-mode 'vm-summary-mode)
-          (eq major-mode 'vm-presentation-mode))
+	  (eq major-mode 'vm-presentation-mode))
       (and (eq major-mode 'vm-presentation-mode) (vm-summarize))
       (vm-follow-summary-cursor)
       (save-excursion
        (vm-select-folder-buffer)
        (let* ((message (car vm-message-pointer))
-              (folder (buffer-file-name))
-              (subject (vm-su-subject message))
-              (author (vm-su-full-name message))
-              (message-id (vm-su-message-id message)))
-         (setq folder (abbreviate-file-name folder))
-         (if (string-match (concat "^" (regexp-quote vm-folder-directory))
-                           folder)
-             (setq folder (replace-match "" t t folder)))
-         (setq cpltxt (concat author " on: " subject))
-         (setq link (concat cpltxt "\n  "
-                            (org-make-link
-                             "vm:" folder "#" message-id))))))
+	      (folder (buffer-file-name))
+	      (subject (vm-su-subject message))
+	      (author (vm-su-full-name message))
+	      (message-id (vm-su-message-id message)))
+	 (setq folder (abbreviate-file-name folder))
+	 (if (string-match (concat "^" (regexp-quote vm-folder-directory))
+			   folder)
+	     (setq folder (replace-match "" t t folder)))
+	 (setq cpltxt (concat author " on: " subject))
+	 (setq link (concat cpltxt "\n  "
+			    (org-make-link
+			     "vm:" folder "#" message-id))))))
 
      ((eq major-mode 'wl-summary-mode)
       (let* ((msgnum (wl-summary-message-number))
-             (message-id (elmo-message-field wl-summary-buffer-elmo-folder
-                                             msgnum 'message-id))
-             (wl-message-entity (elmo-msgdb-overview-get-entity
-                                 msgnum (wl-summary-buffer-msgdb)))
-             (author (wl-summary-line-from)) ; FIXME: how to get author name?
-             (subject "???"))   ; FIXME: How to get subject of email?
-        (setq cpltxt (concat author  " on: " subject))
-        (setq link (concat cpltxt "\n  "
-                           (org-make-link
-                            "wl:" wl-summary-buffer-folder-name
-                           "#" message-id)))))
+	     (message-id (elmo-message-field wl-summary-buffer-elmo-folder
+					     msgnum 'message-id))
+	     (wl-message-entity (elmo-msgdb-overview-get-entity
+				 msgnum (wl-summary-buffer-msgdb)))
+	     (author (wl-summary-line-from)) ; FIXME: how to get author name?
+	     (subject "???"))   ; FIXME: How to get subject of email?
+	(setq cpltxt (concat author  " on: " subject))
+	(setq link (concat cpltxt "\n  "
+			   (org-make-link
+			    "wl:" wl-summary-buffer-folder-name
+			   "#" message-id)))))
 
      ((eq major-mode 'rmail-mode)
       (save-excursion
-        (save-restriction
-          (rmail-narrow-to-non-pruned-header)
-          (let ((folder (buffer-file-name))
-                (message-id (mail-fetch-field "message-id"))
-                (author (mail-fetch-field "from"))
-                (subject (mail-fetch-field "subject")))
-            (setq cpltxt (concat author  " on: " subject))
-            (setq link (concat cpltxt "\n  "
-                               (org-make-link
-                                "rmail:" folder "#" message-id)))))))
+	(save-restriction
+	  (rmail-narrow-to-non-pruned-header)
+	  (let ((folder (buffer-file-name))
+		(message-id (mail-fetch-field "message-id"))
+		(author (mail-fetch-field "from"))
+		(subject (mail-fetch-field "subject")))
+	    (setq cpltxt (concat author  " on: " subject))
+	    (setq link (concat cpltxt "\n  "
+			       (org-make-link
+				"rmail:" folder "#" message-id)))))))
 
      ((eq major-mode 'gnus-group-mode)
       (let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus
-                          (gnus-group-group-name))         ; version
-                         ((fboundp 'gnus-group-name)
-                          (gnus-group-name))
-                         (t "???"))))
-        (setq cpltxt (concat
-                      (if (org-xor arg org-usenet-links-prefer-google)
-                          "http://groups.google.com/groups?group="
-                        "gnus:")
-                      group)
-              link (org-make-link cpltxt))))
+			  (gnus-group-group-name))         ; version
+			 ((fboundp 'gnus-group-name)
+			  (gnus-group-name))
+			 (t "???"))))
+	(setq cpltxt (concat
+		      (if (org-xor arg org-usenet-links-prefer-google)
+			  "http://groups.google.com/groups?group="
+			"gnus:")
+		      group)
+	      link (org-make-link cpltxt))))
 
      ((memq major-mode '(gnus-summary-mode gnus-article-mode))
       (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary))
       (gnus-summary-beginning-of-article)
       (let* ((group (car gnus-article-current))
-             (article (cdr gnus-article-current))
-             (header (gnus-summary-article-header article))
-             (author (mail-header-from header))
-             (message-id (mail-header-id header))
-             (date (mail-header-date header))
-             (subject (gnus-summary-subject-string)))
-        (setq cpltxt (concat author " on: " subject))
-        (if (org-xor arg org-usenet-links-prefer-google)
-            (setq link
-                  (concat
-                   cpltxt "\n  "
-                   (format "http://groups.google.com/groups?as_umsgid=%s"
-                           (org-fixup-message-id-for-http message-id))))
-          (setq link (concat cpltxt "\n"
-                             (org-make-link
-                              "gnus:" group
-                              "#" (number-to-string article)))))))
+	     (article (cdr gnus-article-current))
+	     (header (gnus-summary-article-header article))
+	     (author (mail-header-from header))
+	     (message-id (mail-header-id header))
+	     (date (mail-header-date header))
+	     (subject (gnus-summary-subject-string)))
+	(setq cpltxt (concat author " on: " subject))
+	(if (org-xor arg org-usenet-links-prefer-google)
+	    (setq link
+		  (concat
+		   cpltxt "\n  "
+		   (format "http://groups.google.com/groups?as_umsgid=%s"
+			   (org-fixup-message-id-for-http message-id))))
+	  (setq link (concat cpltxt "\n"
+			     (org-make-link
+			      "gnus:" group
+			      "#" (number-to-string article)))))))
 
      ((eq major-mode 'w3-mode)
       (setq cpltxt (url-view-url t)
-            link (org-make-link cpltxt)))
+	    link (org-make-link cpltxt)))
      ((eq major-mode 'w3m-mode)
       (setq cpltxt w3m-current-url
-            link (org-make-link cpltxt)))
+	    link (org-make-link cpltxt)))
 
      ((buffer-file-name)
       ;; Just link to this file here.
       (setq cpltxt (concat "file:"
-                           (abbreviate-file-name (buffer-file-name))))
+			   (abbreviate-file-name (buffer-file-name))))
       ;; Add the line number?
       (if (org-xor org-line-numbers-in-file-links arg)
-          (setq cpltxt
-                (concat cpltxt
-                        ":" (int-to-string
-                             (+ (if (bolp) 1 0) (count-lines
-                                                 (point-min) (point)))))))
+	  (setq cpltxt
+		(concat cpltxt
+			":" (int-to-string
+			     (+ (if (bolp) 1 0) (count-lines
+						 (point-min) (point)))))))
       (setq link (org-make-link cpltxt)))
 
      ((interactive-p)
@@ -5539,10 +5547,10 @@
      (t (setq link nil)))
 
     (if (and (interactive-p) link)
-        (progn
-          (setq org-stored-links
-                (cons (cons (or cpltxt link) link) org-stored-links))
-          (message "Stored: %s" (or cpltxt link)))
+	(progn
+	  (setq org-stored-links
+		(cons (cons (or cpltxt link) link) org-stored-links))
+	  (message "Stored: %s" (or cpltxt link)))
       link)))
 
 (defun org-make-link (&rest strings)
@@ -5554,24 +5562,24 @@
   (if a (not b) b))
 
 (defun org-get-header (header)
-  "Find a HEADER field in the current buffer."
+  "Find a header field in the current buffer."
   (save-excursion
     (goto-char (point-min))
     (let ((case-fold-search t) s)
       (cond
        ((eq header 'from)
-        (if (re-search-forward "^From:\\s-+\\(.*\\)" nil t)
-            (setq s (match-string 1)))
+	(if (re-search-forward "^From:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1)))
 	(while (string-match "\"" s)
 	  (setq s (replace-match "" t t s)))
 	(if (string-match "[<(].*" s)
 	    (setq s (replace-match "" t t s))))
        ((eq header 'message-id)
-        (if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t)
-            (setq s (match-string 1))))
+	(if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1))))
        ((eq header 'subject)
-        (if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t)
-            (setq s (match-string 1)))))
+	(if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t)
+	    (setq s (match-string 1)))))
       (if (string-match "\\`[ \t\]+" s) (setq s (replace-match "" t t s)))
       (if (string-match "[ \t\]+\\'" s) (setq s (replace-match "" t t s)))
       s)))
@@ -5606,48 +5614,48 @@
 is in the current directory or below."
   (interactive "P")
   (let ((link (if complete-file
-                  (read-file-name "File: ")
-                (completing-read
-                 "Link: " org-stored-links nil nil nil
-                 org-insert-link-history
-                 (or (car (car org-stored-links))))))
+		  (read-file-name "File: ")
+		(completing-read
+		 "Link: " org-stored-links nil nil nil
+		 org-insert-link-history
+		 (or (car (car org-stored-links))))))
 	linktxt matched)
     (if (or (not link) (equal link ""))
       (error "No links available"))
     (if complete-file
-        (let ((pwd (file-name-as-directory (expand-file-name "."))))
-          (cond
-           ((equal complete-file '(16))
-            (insert
-             (org-make-link
-              "file:" (abbreviate-file-name (expand-file-name link)))))
-           ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)")
-                          (expand-file-name link))
-            (insert
-             (org-make-link
-              "file:" (match-string 1 (expand-file-name link)))))
-           (t (insert (org-make-link "file:" link)))))
+	(let ((pwd (file-name-as-directory (expand-file-name "."))))
+	  (cond
+	   ((equal complete-file '(16))
+	    (insert
+	     (org-make-link
+	      "file:" (abbreviate-file-name (expand-file-name link)))))
+	   ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)")
+			  (expand-file-name link))
+	    (insert
+	     (org-make-link
+	      "file:" (match-string 1 (expand-file-name link)))))
+	   (t (insert (org-make-link "file:" link)))))
       (setq linktxt (cdr (assoc link org-stored-links)))
       (if (not org-keep-stored-link-after-insertion)
-          (setq org-stored-links (delq (assoc link org-stored-links)
-                                       org-stored-links)))
+	  (setq org-stored-links (delq (assoc link org-stored-links)
+				       org-stored-links)))
       (if (not linktxt) (setq link (org-make-link link)))
       (let ((lines (org-split-string (or linktxt link) "\n")))
-        (insert (car lines))
-        (setq matched (string-match org-link-regexp (car lines)))
-        (setq lines (cdr lines))
-        (while lines
-          (insert "\n")
+	(insert (car lines))
+	(setq matched (string-match org-link-regexp (car lines)))
+	(setq lines (cdr lines))
+	(while lines
+	  (insert "\n")
 	  (if (save-excursion
 		(beginning-of-line 0)
 		(looking-at "[ \t]+\\S-"))
 	      (indent-relative))
-          (setq matched (or matched
-                            (string-match org-link-regexp (car lines))))
-          (insert (car lines))
-          (setq lines (cdr lines))))
+	  (setq matched (or matched
+			    (string-match org-link-regexp (car lines))))
+	  (insert (car lines))
+	  (setq lines (cdr lines))))
       (unless matched
-        (error "Add link type: http(s),ftp,mailto,file,news,bbdb,vm,wl,rmail,gnus, or shell")))))
+	(error "Add link type: http(s),ftp,mailto,file,news,bbdb,vm,wl,rmail,gnus, or shell")))))
 
 ;;; Hooks for remember.el
 ;;;###autoload
@@ -5663,7 +5671,7 @@
 UP/DOWN=headline   TAB=cycle visibility  [Q]uit   RET/<left>/<right>=Store
 RET at beg-of-buf -> Append to file as level 2 headline
 RET on headline   -> Store as sublevel entry to current headline
-<left>/<right>    -> Before/after current headline, same headings level")
+<left>/<right>    -> before/after current headline, same headings level")
 
 ;;;###autoload
 (defun org-remember-handler ()
@@ -5681,7 +5689,7 @@
 RET      buffer-start      as level 2 heading at end of file
 RET      on headline       as sublevel of the heading at cursor
 RET      no heading        at cursor position, level taken from context.
-                           Or use prefix arg to specify level manually.
+			   Or use prefix arg to specify level manually.
 <left>   on headline       as same level, before current heading
 <right>  on headline       as same level, after current heading
 
@@ -5701,77 +5709,77 @@
 See also the variable `org-reverse-note-order'."
   (catch 'quit
     (let* ((txt (buffer-substring (point-min) (point-max)))
-           (fastp current-prefix-arg)
-           (file (if fastp org-default-notes-file (org-get-org-file)))
-           (visiting (find-buffer-visiting file))
-           (org-startup-with-deadline-check nil)
-           (org-startup-folded nil)
-           spos level indent reversed)
+	   (fastp current-prefix-arg)
+	   (file (if fastp org-default-notes-file (org-get-org-file)))
+	   (visiting (find-buffer-visiting file))
+	   (org-startup-with-deadline-check nil)
+	   (org-startup-folded nil)
+	   spos level indent reversed)
       ;; Modify text so that it becomes a nice subtree which can be inserted
       ;; into an org tree.
       (let* ((lines (split-string txt "\n"))
-             (first (car lines))
-             (lines (cdr lines)))
-        (if (string-match "^\\*+" first)
-            ;; Is already a headline
-            (setq indent (make-string (- (match-end 0) (match-beginning 0)
-                                         -1) ?\ ))
-          ;; We need to add a headline:  Use time and first buffer line
-          (setq lines (cons first lines)
-                first (concat "* " (current-time-string)
-                              " (" (remember-buffer-desc) ")")
-                indent "  "))
-        (if org-adapt-indentation
-            (setq lines (mapcar (lambda (x) (concat indent x)) lines)))
-        (setq txt (concat first "\n"
-                          (mapconcat 'identity lines "\n"))))
+	     (first (car lines))
+	     (lines (cdr lines)))
+	(if (string-match "^\\*+" first)
+	    ;; Is already a headline
+	    (setq indent (make-string (- (match-end 0) (match-beginning 0)
+					 -1) ?\ ))
+	  ;; We need to add a headline:  Use time and first buffer line
+	  (setq lines (cons first lines)
+		first (concat "* " (current-time-string)
+			      " (" (remember-buffer-desc) ")")
+		indent "  "))
+	(if org-adapt-indentation
+	    (setq lines (mapcar (lambda (x) (concat indent x)) lines)))
+	(setq txt (concat first "\n"
+			  (mapconcat 'identity lines "\n"))))
       ;; Find the file
       (if (not visiting)
-          (find-file-noselect file))
+	  (find-file-noselect file))
       (with-current-buffer (get-file-buffer file)
-        (setq reversed (org-notes-order-reversed-p))
-        (save-excursion
-          (save-restriction
-            (widen)
-            ;; Ask the User for a location
-            (setq spos (if fastp 1 (org-get-location
-                                    (current-buffer)
-                                    org-remember-help)))
-            (if (not spos) (throw 'quit nil)) ; return nil to show we did
-                                              ; not handle this note
-            (goto-char spos)
-            (cond ((bobp)
-                   ;; Put it at the start or end, as level 2
-                   (save-restriction
-                     (widen)
-                     (goto-char (if reversed (point-min) (point-max)))
-                     (if (not (bolp)) (newline))
-                     (org-paste-subtree (or current-prefix-arg 2) txt)))
-                  ((and (org-on-heading-p nil) (not current-prefix-arg))
-                   ;; Put it below this entry, at the beg/end of the subtree
-                   (org-back-to-heading)
-                   (setq level (outline-level))
-                   (if reversed
-                       (outline-end-of-heading)
-                     (outline-end-of-subtree))
-                   (if (not (bolp)) (newline))
-                   (beginning-of-line 1)
-                   (org-paste-subtree (1+ level) txt))
-                  (t
-                   ;; Put it right there, with automatic level determined by
-                   ;; org-paste-subtree or from prefix arg
-                   (org-paste-subtree current-prefix-arg txt)))
-            (when remember-save-after-remembering
-              (save-buffer)
-              (if (not visiting) (kill-buffer (current-buffer)))))))))
+	(setq reversed (org-notes-order-reversed-p))
+	(save-excursion
+	  (save-restriction
+	    (widen)
+	    ;; Ask the User for a location
+	    (setq spos (if fastp 1 (org-get-location
+				    (current-buffer)
+				    org-remember-help)))
+	    (if (not spos) (throw 'quit nil)) ; return nil to show we did
+					      ; not handle this note
+	    (goto-char spos)
+	    (cond ((bobp)
+		   ;; Put it at the start or end, as level 2
+		   (save-restriction
+		     (widen)
+		     (goto-char (if reversed (point-min) (point-max)))
+		     (if (not (bolp)) (newline))
+		     (org-paste-subtree (or current-prefix-arg 2) txt)))
+		  ((and (org-on-heading-p nil) (not current-prefix-arg))
+		   ;; Put it below this entry, at the beg/end of the subtree
+		   (org-back-to-heading)
+		   (setq level (outline-level))
+		   (if reversed
+		       (outline-end-of-heading)
+		     (outline-end-of-subtree))
+		   (if (not (bolp)) (newline))
+		   (beginning-of-line 1)
+		   (org-paste-subtree (1+ level) txt))
+		  (t
+		   ;; Put it right there, with automatic level determined by
+		   ;; org-paste-subtree or from prefix arg
+		   (org-paste-subtree current-prefix-arg txt)))
+	    (when remember-save-after-remembering
+	      (save-buffer)
+	      (if (not visiting) (kill-buffer (current-buffer)))))))))
   t)    ;; return t to indicate that we took care of this note.
 
 (defun org-get-org-file ()
   "Read a filename, with default directory `org-directory'."
   (let ((default (or org-default-notes-file remember-data-file)))
     (read-file-name (format "File name [%s]: " default)
-                    (file-name-as-directory org-directory)
-                    default)))
+		    (file-name-as-directory org-directory)
+		    default)))
 
 (defun org-notes-order-reversed-p ()
   "Check if the current file should receive notes in reversed order."
@@ -5780,12 +5788,12 @@
    ((eq t org-reverse-note-order) t)
    ((not (listp org-reverse-note-order)) nil)
    (t (catch 'exit
-        (let  ((all org-reverse-note-order)
-               entry)
-          (while (setq entry (pop all))
-            (if (string-match (car entry) (buffer-file-name))
-                (throw 'exit (cdr entry))))
-          nil)))))
+	(let  ((all org-reverse-note-order)
+	       entry)
+	  (while (setq entry (pop all))
+	    (if (string-match (car entry) (buffer-file-name))
+		(throw 'exit (cdr entry))))
+	  nil)))))
 
 ;;; Tables
 
@@ -5830,10 +5838,10 @@
   (cond
    ((org-at-table.el-p)
     (if (y-or-n-p "Convert table to Org-mode table? ")
-        (org-table-convert)))
+	(org-table-convert)))
    ((org-at-table-p)
     (if (y-or-n-p "Convert table to table.el table? ")
-        (org-table-convert)))
+	(org-table-convert)))
    (t (call-interactively 'table-insert))))
 
 (defun org-table-create (&optional size)
@@ -5842,30 +5850,30 @@
   (interactive "P")
   (unless size
     (setq size (read-string
-                (concat "Table size Columns x Rows [e.g. "
-                        org-table-default-size "]: ")
-                "" nil org-table-default-size)))
+		(concat "Table size Columns x Rows [e.g. "
+			org-table-default-size "]: ")
+		"" nil org-table-default-size)))
 
   (let* ((pos (point))
-         (indent (make-string (current-column) ?\ ))
-         (split (org-split-string size " *x *"))
-         (rows (string-to-number (nth 1 split)))
-         (columns (string-to-number (car split)))
-         (line (concat (apply 'concat indent "|" (make-list columns "  |"))
-                       "\n")))
+	 (indent (make-string (current-column) ?\ ))
+	 (split (org-split-string size " *x *"))
+	 (rows (string-to-number (nth 1 split)))
+	 (columns (string-to-number (car split)))
+	 (line (concat (apply 'concat indent "|" (make-list columns "  |"))
+		       "\n")))
     (if (string-match "^[ \t]*$" (buffer-substring-no-properties
-                                  (point-at-bol) (point)))
-        (beginning-of-line 1)
+				  (point-at-bol) (point)))
+	(beginning-of-line 1)
       (newline))
     ;; (mapcar (lambda (x) (insert line)) (make-list rows t))
     (dotimes (i rows) (insert line))
     (goto-char pos)
     (if (> rows 1)
-        ;; Insert a hline after the first row.
-        (progn
-          (end-of-line 1)
-          (insert "\n|-")
-          (goto-char pos)))
+	;; Insert a hline after the first row.
+	(progn
+	  (end-of-line 1)
+	  (insert "\n|-")
+	  (goto-char pos)))
     (org-table-align)))
 
 (defun org-table-convert-region (beg0 end0 nspace)
@@ -5873,11 +5881,11 @@
 The region goes from BEG0 to END0, but these borders will be moved
 slightly, to make sure a beginning of line in the first line is included.
 When NSPACE is non-nil, it indicates the minimum number of spaces that
-separate columns (default: just one space)."
+separate columns (default: just one space)"
   (let* ((beg (min beg0 end0))
-         (end (max beg0 end0))
-         (tabsep t)
-         re)
+	 (end (max beg0 end0))
+	 (tabsep t)
+	 re)
     (goto-char beg)
     (beginning-of-line 1)
     (setq beg (move-marker (make-marker) (point)))
@@ -5887,14 +5895,14 @@
     ;; Lets see if this is tab-separated material.  If every nonempty line
     ;; contains a tab, we will assume that it is tab-separated material
     (if nspace
-        (setq tabsep nil)
+	(setq tabsep nil)
       (goto-char beg)
       (and (re-search-forward "^[^\n\t]+$" end t) (setq tabsep nil)))
     (if nspace (setq tabsep nil))
     (if tabsep
-        (setq re "^\\|\t")
+	(setq re "^\\|\t")
       (setq re (format "^ *\\| *\t *\\| \\{%d,\\}"
-                       (max 1 (prefix-numeric-value nspace)))))
+		       (max 1 (prefix-numeric-value nspace)))))
     (goto-char beg)
     (while (re-search-forward re end t)
       (replace-match "|" t t))
@@ -5910,7 +5918,7 @@
   (interactive "f\nP")
   (or (bolp) (newline))
   (let ((beg (point))
-        (pm (point-max)))
+	(pm (point-max)))
     (insert-file-contents file)
     (org-table-convert-region beg (+ (point) (- (point-max) pm)) arg)))
 
@@ -5919,12 +5927,12 @@
 Such a file can be imported into a spreadsheet program like Excel."
   (interactive)
   (let* ((beg (org-table-begin))
-         (end (org-table-end))
-         (table (buffer-substring beg end))
-         (file (read-file-name "Export table to: "))
-         buf)
+	 (end (org-table-end))
+	 (table (buffer-substring beg end))
+	 (file (read-file-name "Export table to: "))
+	 buf)
     (unless (or (not (file-exists-p file))
-                (y-or-n-p (format "Overwrite file %s? " file)))
+		(y-or-n-p (format "Overwrite file %s? " file)))
       (error "Abort"))
     (with-current-buffer (find-file-noselect file)
       (setq buf (current-buffer))
@@ -5933,20 +5941,20 @@
       (insert table)
       (goto-char (point-min))
       (while (re-search-forward "^[ \t]*|[ \t]*" nil t)
-        (replace-match "" t t)
-        (end-of-line 1))
+	(replace-match "" t t)
+	(end-of-line 1))
       (goto-char (point-min))
       (while (re-search-forward "[ \t]*|[ \t]*$" nil t)
-        (replace-match "" t t)
-        (goto-char (min (1+ (point)) (point-max))))
+	(replace-match "" t t)
+	(goto-char (min (1+ (point)) (point-max))))
       (goto-char (point-min))
       (while (re-search-forward "^-[-+]*$" nil t)
-        (replace-match "")
-        (if (looking-at "\n")
-            (delete-char 1)))
+	(replace-match "")
+	(if (looking-at "\n")
+	    (delete-char 1)))
       (goto-char (point-min))
       (while (re-search-forward "[ \t]*|[ \t]*" nil t)
-        (replace-match "\t" t t))
+	(replace-match "\t" t t))
       (save-buffer))
     (kill-buffer buf)))
 
@@ -5969,52 +5977,53 @@
 (defun org-table-align ()
   "Align the table at point by aligning all vertical bars."
   (interactive)
+  ;; (message "align") (sit-for 2)
   (let* (
-         ;; Limits of table
-         (beg (org-table-begin))
-         (end (org-table-end))
-         ;; Current cursor position
-         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
-         (colpos (org-table-current-column))
-         (winstart (window-start))
-         text lines (new "") lengths l typenums ty fields maxfields i
-         column
-         (indent "") cnt frac
-         rfmt hfmt
-         (spaces (if (org-in-invisibility-spec-p '(org-table))
-                     org-table-spaces-around-invisible-separators
-                   org-table-spaces-around-separators))
-         (sp1 (car spaces))
-         (sp2 (cdr spaces))
-         (rfmt1 (concat
-                 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
-         (hfmt1 (concat
-                 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
-         emptystrings)
+	 ;; Limits of table
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+	 (colpos (org-table-current-column))
+	 (winstart (window-start))
+	 text lines (new "") lengths l typenums ty fields maxfields i
+	 column
+	 (indent "") cnt frac
+	 rfmt hfmt
+	 (spaces (if (org-in-invisibility-spec-p '(org-table))
+		     org-table-spaces-around-invisible-separators
+		   org-table-spaces-around-separators))
+	 (sp1 (car spaces))
+	 (sp2 (cdr spaces))
+	 (rfmt1 (concat
+		 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
+	 (hfmt1 (concat
+		 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
+	 emptystrings)
     (untabify beg end)
     ;; (message "Aligning table...")
     ;; Get the rows
     (setq lines (org-split-string
-                 (buffer-substring-no-properties beg end) "\n"))
+		 (buffer-substring-no-properties beg end) "\n"))
     ;; Store the indentation of the first line
     (if (string-match "^ *" (car lines))
-        (setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
+	(setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
     ;; Mark the hlines
     (setq lines (mapcar (lambda (l)
-                          (if (string-match "^ *|-" l)
-                              nil
-                            (if (string-match "[ \t]+$" l)
-                                (substring l 0 (match-beginning 0))
-                              l)))
-                        lines))
+			  (if (string-match "^ *|-" l)
+			      nil
+			    (if (string-match "[ \t]+$" l)
+				(substring l 0 (match-beginning 0))
+			      l)))
+			lines))
     ;; Get the data fields
     (setq fields (mapcar
-                  (lambda (l)
-                      (org-split-string l " *| *"))
-                  (delq nil (copy-sequence lines))))
+		  (lambda (l)
+		      (org-split-string l " *| *"))
+		  (delq nil (copy-sequence lines))))
     ;; How many fields in the longest line?
     (condition-case nil
-        (setq maxfields (apply 'max (mapcar 'length fields)))
+	(setq maxfields (apply 'max (mapcar 'length fields)))
       (error
        (kill-region beg end)
        (org-table-create org-table-default-size)
@@ -6032,25 +6041,25 @@
       (setq cnt 0 frac 0.0)
       (mapcar
        (lambda (x)
-         (if (equal x "")
-             nil
-           (setq frac ( / (+ (* frac cnt)
-                             (if (string-match org-table-number-regexp x) 1 0))
-                          (setq cnt (1+ cnt))))))
+	 (if (equal x "")
+	     nil
+	   (setq frac ( / (+ (* frac cnt)
+			     (if (string-match org-table-number-regexp x) 1 0))
+			  (setq cnt (1+ cnt))))))
        column)
       (push (>= frac org-table-number-fraction) typenums))
     (setq lengths (nreverse lengths)
-          typenums (nreverse typenums))
+	  typenums (nreverse typenums))
     (setq org-table-last-alignment typenums
-          org-table-last-column-widths lengths)
+	  org-table-last-column-widths lengths)
     ;; Compute the formats needed for output of the table
     (setq rfmt (concat indent "|") hfmt (concat indent "|"))
     (while (setq l (pop lengths))
       (setq ty (if (pop typenums) "" "-")) ; number types flushright
       (setq rfmt (concat rfmt (format rfmt1 ty l))
-            hfmt (concat hfmt (format hfmt1 (make-string l ?-)))))
+	    hfmt (concat hfmt (format hfmt1 (make-string l ?-)))))
     (setq rfmt (concat rfmt "\n")
-          hfmt (concat (substring hfmt 0 -1) "|\n"))
+	  hfmt (concat (substring hfmt 0 -1) "|\n"))
     ;; Produce the new table
     ;;(while lines
     ;;  (setq l (pop lines))
@@ -6059,11 +6068,11 @@
     ;;                                   (append (pop fields) emptystrings))))
     ;;    (setq new (concat new hfmt))))
     (setq new (mapconcat
-               (lambda (l)
-                 (if l (apply 'format rfmt
-                              (append (pop fields) emptystrings))
-                   hfmt))
-               lines ""))
+	       (lambda (l)
+		 (if l (apply 'format rfmt
+			      (append (pop fields) emptystrings))
+		   hfmt))
+	       lines ""))
     ;; Replace the old one
     (delete-region beg end)
     (move-marker end nil)
@@ -6076,7 +6085,7 @@
     (org-table-goto-column colpos)
     (setq org-table-may-need-update nil)
     (if (org-in-invisibility-spec-p '(org-table))
-        (org-table-add-invisible-to-vertical-lines))
+	(org-table-add-invisible-to-vertical-lines))
     ))
 
 (defun org-table-begin (&optional table-type)
@@ -6084,10 +6093,10 @@
 With argument TABLE-TYPE, go to the beginning of a table.el-type table."
   (save-excursion
     (if (not (re-search-backward
-              (if table-type org-table-any-border-regexp
-                org-table-border-regexp)
-              nil t))
-        (error "Can't find beginning of table")
+	      (if table-type org-table-any-border-regexp
+		org-table-border-regexp)
+	      nil t))
+	(error "Can't find beginning of table")
       (goto-char (match-beginning 0))
       (beginning-of-line 2)
       (point))))
@@ -6097,43 +6106,52 @@
 With argument TABLE-TYPE, go to the end of a table.el-type table."
   (save-excursion
     (if (not (re-search-forward
-              (if table-type org-table-any-border-regexp
-                org-table-border-regexp)
-              nil t))
-        (goto-char (point-max))
+	      (if table-type org-table-any-border-regexp
+		org-table-border-regexp)
+	      nil t))
+	(goto-char (point-max))
       (goto-char (match-beginning 0)))
     (point-marker)))
 
-(defun org-table-justify-field-maybe ()
-  "Justify the current field, text to left, number to right."
+(defun org-table-justify-field-maybe (&optional new)
+  "Justify the current field, text to left, number to right.
+Optional argument NEW may specify text to replace the current field content."
   (cond
-   (org-table-may-need-update) ; Realignment will happen anyway, don't bother
+   ((and (not new) org-table-may-need-update)) ; Realignment will happen anyway
    ((org-at-table-hline-p)
-    ;; This is pretty stupid, but I don't know how to deal with hlines
-    (setq org-table-may-need-update t))
-   ((or (not (equal (marker-buffer org-table-aligned-begin-marker)
-                    (current-buffer)))
-        (< (point) org-table-aligned-begin-marker)
-        (>= (point) org-table-aligned-end-marker))
+    ;; FIXME:  I use to enforce realign here, but I think this is not needed.
+    ;; (setq org-table-may-need-update t)
+    )
+   ((and (not new)
+	 (or (not (equal (marker-buffer org-table-aligned-begin-marker)
+			 (current-buffer)))
+	     (< (point) org-table-aligned-begin-marker)
+	     (>= (point) org-table-aligned-end-marker)))
     ;; This is not the same table, force a full re-align
     (setq org-table-may-need-update t))
    (t ;; realign the current field, based on previous full realign
-    (let* ((pos (point)) s org-table-may-need-update
-           (col (org-table-current-column))
-           (num (nth (1- col) org-table-last-alignment))
-           l f n o)
+    (let* ((pos (point)) s
+	   (col (org-table-current-column))
+	   (num (nth (1- col) org-table-last-alignment))
+	   l f n o upd)
       (when (> col 0)
-        (skip-chars-backward "^|\n")
-        (if (looking-at " *\\([^|\n]*?\\) *|")
-            (progn
-              (setq s (match-string 1)
-                    o (match-string 0)
-                    l (max 1 (- (match-end 0) (match-beginning 0) 3)))
-              (setq f (format (if num " %%%ds |" " %%-%ds |") l)
-                    n (format f s t t))
-              (or (equal n o) (replace-match n)))
-          (setq org-table-may-need-update t))
-        (goto-char pos))))))
+	(skip-chars-backward "^|\n")
+	(if (looking-at " *\\([^|\n]*?\\) *|")
+	    (progn
+	      (setq s (match-string 1)
+		    o (match-string 0)
+		    l (max 1 (- (match-end 0) (match-beginning 0) 3)))
+	      (setq f (format (if num " %%%ds |" " %%-%ds |") l)
+		    n (format f s t t))
+	      (if new
+		  (if (<= (length new) l)
+		      (setq n (format f new t t))  ;; FIXME: why t t?????
+		    (setq n (concat new "|") org-table-may-need-update t)))
+	      (or (equal n o)
+		  (let (org-table-may-need-update)
+		    (replace-match n))))
+	  (setq org-table-may-need-update t))
+	(goto-char pos))))))
 
 (defun org-table-next-field ()
   "Go to the next field in the current table.
@@ -6142,20 +6160,20 @@
   (org-table-maybe-eval-formula)
   (org-table-maybe-recalculate-line)
   (if (and org-table-automatic-realign
-           org-table-may-need-update)
+	   org-table-may-need-update)
       (org-table-align))
   (if (org-at-table-hline-p)
       (end-of-line 1))
   (condition-case nil
       (progn
-        (re-search-forward "|" (org-table-end))
-        (if (looking-at "[ \t]*$")
-            (re-search-forward "|" (org-table-end)))
-        (if (looking-at "-")
-            (progn
-              (beginning-of-line 0)
-              (org-table-insert-row 'below))
-          (if (looking-at " ") (forward-char 1))))
+	(re-search-forward "|" (org-table-end))
+	(if (looking-at "[ \t]*$")
+	    (re-search-forward "|" (org-table-end)))
+	(if (looking-at "-")
+	    (progn
+	      (beginning-of-line 0)
+	      (org-table-insert-row 'below))
+	  (if (looking-at " ") (forward-char 1))))
     (error
      (org-table-insert-row 'below))))
 
@@ -6166,7 +6184,7 @@
   (org-table-justify-field-maybe)
   (org-table-maybe-recalculate-line)
   (if (and org-table-automatic-realign
-           org-table-may-need-update)
+	   org-table-may-need-update)
       (org-table-align))
   (if (org-at-table-hline-p)
       (end-of-line 1))
@@ -6184,18 +6202,18 @@
   (org-table-maybe-eval-formula)
   (org-table-maybe-recalculate-line)
   (if (or (looking-at "[ \t]*$")
-          (save-excursion (skip-chars-backward " \t") (bolp)))
+	  (save-excursion (skip-chars-backward " \t") (bolp)))
       (newline)
     (if (and org-table-automatic-realign
-             org-table-may-need-update)
-        (org-table-align))
+	     org-table-may-need-update)
+	(org-table-align))
     (let ((col (org-table-current-column)))
       (beginning-of-line 2)
       (if (or (not (org-at-table-p))
-              (org-at-table-hline-p))
-          (progn
-            (beginning-of-line 0)
-            (org-table-insert-row 'below)))
+	      (org-at-table-hline-p))
+	  (progn
+	    (beginning-of-line 0)
+	    (org-table-insert-row 'below)))
       (org-table-goto-column col)
       (skip-chars-backward "^|\n\r")
       (if (looking-at " ") (forward-char 1)))))
@@ -6211,44 +6229,44 @@
 integer, it will be incremented while copying."
   (interactive "p")
   (let* ((colpos (org-table-current-column))
-         (field (org-table-get-field))
-         (non-empty (string-match "[^ \t]" field))
-         (beg (org-table-begin))
-         txt)
+	 (field (org-table-get-field))
+	 (non-empty (string-match "[^ \t]" field))
+	 (beg (org-table-begin))
+	 txt)
     (org-table-check-inside-data-field)
     (if non-empty
-        (progn
-          (setq txt (org-trim field))
-          (org-table-next-row)
-          (org-table-blank-field))
+	(progn
+	  (setq txt (org-trim field))
+	  (org-table-next-row)
+	  (org-table-blank-field))
       (save-excursion
-        (setq txt
-              (catch 'exit
-                (while (progn (beginning-of-line 1)
-                              (re-search-backward org-table-dataline-regexp
-                                                  beg t))
-                  (org-table-goto-column colpos t)
-                  (if (and (looking-at
-                            "|[ \t]*\\([^| \t][^|]*?\\)[ \t]*|")
-                           (= (setq n (1- n)) 0))
-                      (throw 'exit (match-string 1))))))))
+	(setq txt
+	      (catch 'exit
+		(while (progn (beginning-of-line 1)
+			      (re-search-backward org-table-dataline-regexp
+						  beg t))
+		  (org-table-goto-column colpos t)
+		  (if (and (looking-at
+			    "|[ \t]*\\([^| \t][^|]*?\\)[ \t]*|")
+			   (= (setq n (1- n)) 0))
+		      (throw 'exit (match-string 1))))))))
     (if txt
-        (progn
-          (if (and org-table-copy-increment
-                   (string-match "^[0-9]+$" txt))
-              (setq txt (format "%d" (+ (string-to-int txt) 1))))
-          (insert txt)
-          (org-table-maybe-recalculate-line)
-          (org-table-align))
+	(progn
+	  (if (and org-table-copy-increment
+		   (string-match "^[0-9]+$" txt))
+	      (setq txt (format "%d" (+ (string-to-int txt) 1))))
+	  (insert txt)
+	  (org-table-maybe-recalculate-line)
+	  (org-table-align))
       (error "No non-empty field found"))))
 
 (defun org-table-check-inside-data-field ()
   "Is point inside a table data field?
 I.e. not on a hline or before the first or after the last column?"
   (if (or (not (org-at-table-p))
-          (= (org-table-current-column) 0)
-          (org-at-table-hline-p)
-          (looking-at "[ \t]*$"))
+	  (= (org-table-current-column) 0)
+	  (org-at-table-hline-p)
+	  (looking-at "[ \t]*$"))
       (error "Not in table data field")))
 
 (defvar org-table-clip nil
@@ -6260,16 +6278,16 @@
   (org-table-check-inside-data-field)
   (if (and (interactive-p) (org-region-active-p))
       (let (org-table-clip)
-        (org-table-cut-region (region-beginning) (region-end)))
+	(org-table-cut-region (region-beginning) (region-end)))
     (skip-chars-backward "^|")
     (backward-char 1)
     (if (looking-at "|[^|\n]+")
-        (let* ((pos (match-beginning 0))
-               (match (match-string 0))
-               (len (length match)))
-          (replace-match (concat "|" (make-string (1- len) ?\ )))
-          (goto-char (+ 2 pos))
-          (substring match 1)))))
+	(let* ((pos (match-beginning 0))
+	       (match (match-string 0))
+	       (len (length match)))
+	  (replace-match (concat "|" (make-string (1- len) ?\ )))
+	  (goto-char (+ 2 pos))
+	  (substring match 1)))))
 
 (defun org-table-get-field (&optional n replace)
   "Return the value of the field in column N of current row.
@@ -6281,11 +6299,11 @@
   (backward-char 1)
   (if (looking-at "|[^|\r\n]*")
       (let* ((pos (match-beginning 0))
-             (val (buffer-substring (1+ pos) (match-end 0))))
-        (if replace
-            (replace-match (concat "|" replace)))
-        (goto-char (min (point-at-eol) (+ 2 pos)))
-        val)
+	     (val (buffer-substring (1+ pos) (match-end 0))))
+	(if replace
+	    (replace-match (concat "|" replace)))
+	(goto-char (min (point-at-eol) (+ 2 pos)))
+	val)
     (forward-char 1) ""))
 
 (defun org-table-current-column ()
@@ -6297,7 +6315,7 @@
     (let ((cnt 0) (pos (point)))
       (beginning-of-line 1)
       (while (search-forward "|" pos t)
-        (setq cnt (1+ cnt)))
+	(setq cnt (1+ cnt)))
       (if (interactive-p) (message "This is table column %d" cnt))
       cnt)))
 
@@ -6311,69 +6329,69 @@
     (beginning-of-line 1)
     (when (> n 0)
       (while (and (> (setq n (1- n)) -1)
-                  (or (search-forward "|" pos t)
-                      (and force
-                           (progn (end-of-line 1)
-                                  (skip-chars-backward "^|")
-                                  (insert " | "))))))
+		  (or (search-forward "|" pos t)
+		      (and force
+			   (progn (end-of-line 1)
+				  (skip-chars-backward "^|")
+				  (insert " | "))))))
 ;                                  (backward-char 2) t)))))
       (when (and force (not (looking-at ".*|")))
-        (save-excursion (end-of-line 1) (insert " | ")))
+	(save-excursion (end-of-line 1) (insert " | ")))
       (if on-delim
-          (backward-char 1)
-        (if (looking-at " ") (forward-char 1))))))
+	  (backward-char 1)
+	(if (looking-at " ") (forward-char 1))))))
 
 (defun org-at-table-p (&optional table-type)
   "Return t if the cursor is inside an org-type table.
-If TABLE-TYPE is non-nil, also check for table.el-type tables."
+If TABLE-TYPE is non-nil, also chack for table.el-type tables."
   (if org-enable-table-editor
       (save-excursion
-        (beginning-of-line 1)
-        (looking-at (if table-type org-table-any-line-regexp
-                      org-table-line-regexp)))
+	(beginning-of-line 1)
+	(looking-at (if table-type org-table-any-line-regexp
+		      org-table-line-regexp)))
     nil))
 
 (defun org-table-recognize-table.el ()
   "If there is a table.el table nearby, recognize it and move into it."
   (if org-table-tab-recognizes-table.el
       (if (org-at-table.el-p)
-          (progn
-            (beginning-of-line 1)
-            (if (looking-at org-table-dataline-regexp)
-                nil
-              (if (looking-at org-table1-hline-regexp)
-                  (progn
-                    (beginning-of-line 2)
-                    (if (looking-at org-table-any-border-regexp)
-                        (beginning-of-line -1)))))
-            (if (re-search-forward "|" (org-table-end t) t)
-                (progn
-                  (require 'table)
-                  (if (table--at-cell-p (point))
-                      t
-                    (message "recognizing table.el table...")
-                    (table-recognize-table)
-                    (message "recognizing table.el table...done")))
-              (error "This should not happen..."))
-            t)
-        nil)
+	  (progn
+	    (beginning-of-line 1)
+	    (if (looking-at org-table-dataline-regexp)
+		nil
+	      (if (looking-at org-table1-hline-regexp)
+		  (progn
+		    (beginning-of-line 2)
+		    (if (looking-at org-table-any-border-regexp)
+			(beginning-of-line -1)))))
+	    (if (re-search-forward "|" (org-table-end t) t)
+		(progn
+		  (require 'table)
+		  (if (table--at-cell-p (point))
+		      t
+		    (message "recognizing table.el table...")
+		    (table-recognize-table)
+		    (message "recognizing table.el table...done")))
+	      (error "This should not happen..."))
+	    t)
+	nil)
     nil))
 
 (defun org-at-table.el-p ()
   "Return t if the cursor is inside a table.el-type table."
   (save-excursion
     (if (org-at-table-p 'any)
-        (progn
-          (goto-char (org-table-begin 'any))
-          (looking-at org-table1-hline-regexp))
+	(progn
+	  (goto-char (org-table-begin 'any))
+	  (looking-at org-table1-hline-regexp))
       nil)))
 
 (defun org-at-table-hline-p ()
   "Return t if the cursor is inside a hline in a table."
   (if org-enable-table-editor
       (save-excursion
-        (beginning-of-line 1)
-        (looking-at org-table-hline-regexp))
+	(beginning-of-line 1)
+	(looking-at org-table-hline-regexp))
     nil))
 
 (defun org-table-insert-column ()
@@ -6383,17 +6401,17 @@
       (error "Not at a table"))
   (org-table-find-dataline)
   (let* ((col (max 1 (org-table-current-column)))
-         (beg (org-table-begin))
-         (end (org-table-end))
-         ;; Current cursor position
-         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
-         (colpos col))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+	 (colpos col))
     (goto-char beg)
     (while (< (point) end)
       (if (org-at-table-hline-p)
-          nil
-        (org-table-goto-column col t)
-        (insert "|   "))
+	  nil
+	(org-table-goto-column col t)
+	(insert "|   "))
       (beginning-of-line 2))
     (move-marker end nil)
     (goto-line linepos)
@@ -6404,21 +6422,21 @@
 (defun org-table-find-dataline ()
   "Find a dataline in the current table, which is needed for column commands."
   (if (and (org-at-table-p)
-           (not (org-at-table-hline-p)))
+	   (not (org-at-table-hline-p)))
       t
     (let ((col (current-column))
-          (end (org-table-end)))
+	  (end (org-table-end)))
       (move-to-column col)
       (while (and (< (point) end)
-                  (or (not (= (current-column) col))
-                      (org-at-table-hline-p)))
-        (beginning-of-line 2)
-        (move-to-column col))
+		  (or (not (= (current-column) col))
+		      (org-at-table-hline-p)))
+	(beginning-of-line 2)
+	(move-to-column col))
       (if (and (org-at-table-p)
-               (not (org-at-table-hline-p)))
-          t
-        (error
-         "Please position cursor in a data line for column operations")))))
+	       (not (org-at-table-hline-p)))
+	  t
+	(error
+	 "Please position cursor in a data line for column operations")))))
 
 (defun org-table-delete-column ()
   "Delete a column into the table."
@@ -6428,18 +6446,18 @@
   (org-table-find-dataline)
   (org-table-check-inside-data-field)
   (let* ((col (org-table-current-column))
-         (beg (org-table-begin))
-         (end (org-table-end))
-         ;; Current cursor position
-         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
-         (colpos col))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+	 (colpos col))
     (goto-char beg)
     (while (< (point) end)
       (if (org-at-table-hline-p)
-          nil
-        (org-table-goto-column col t)
-        (and (looking-at "|[^|\n]+|")
-             (replace-match "|")))
+	  nil
+	(org-table-goto-column col t)
+	(and (looking-at "|[^|\n]+|")
+	     (replace-match "|")))
       (beginning-of-line 2))
     (move-marker end nil)
     (goto-line linepos)
@@ -6464,23 +6482,23 @@
   (org-table-find-dataline)
   (org-table-check-inside-data-field)
   (let* ((col (org-table-current-column))
-         (col1 (if left (1- col) col))
-         (beg (org-table-begin))
-         (end (org-table-end))
-         ;; Current cursor position
-         (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
-         (colpos (if left (1- col) (1+ col))))
+	 (col1 (if left (1- col) col))
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 ;; Current cursor position
+	 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+	 (colpos (if left (1- col) (1+ col))))
     (if (and left (= col 1))
-        (error "Cannot move column further left"))
+	(error "Cannot move column further left"))
     (if (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
-        (error "Cannot move column further right"))
+	(error "Cannot move column further right"))
     (goto-char beg)
     (while (< (point) end)
       (if (org-at-table-hline-p)
-          nil
-        (org-table-goto-column col1 t)
-        (and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|")
-             (replace-match "|\\2|\\1|")))
+	  nil
+	(org-table-goto-column col1 t)
+	(and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|")
+	     (replace-match "|\\2|\\1|")))
       (beginning-of-line 2))
     (move-marker end nil)
     (goto-line linepos)
@@ -6489,11 +6507,11 @@
     (org-table-modify-formulas 'swap col (if left (1- col) (1+ col)))))
 
 (defun org-table-move-row-down ()
-  "Move table row down."
+  "move table row down."
   (interactive)
   (org-table-move-row nil))
 (defun org-table-move-row-up ()
-  "Move table row up."
+  "move table row up."
   (interactive)
   (org-table-move-row 'up))
 
@@ -6501,14 +6519,14 @@
   "Move the current table line down.  With arg UP, move it up."
   (interactive "P")
   (let ((col (current-column))
-        (pos (point))
-        (tonew (if up 0 2))
-        txt)
+	(pos (point))
+	(tonew (if up 0 2))
+	txt)
     (beginning-of-line tonew)
     (if (not (org-at-table-p))
-        (progn
-          (goto-char pos)
-          (error "Cannot move row further")))
+	(progn
+	  (goto-char pos)
+	  (error "Cannot move row further")))
     (goto-char pos)
     (beginning-of-line 1)
     (setq pos (point))
@@ -6526,14 +6544,14 @@
   (if (not (org-at-table-p))
       (error "Not at a table"))
   (let* ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
-         new)
+	 new)
     (if (string-match "^[ \t]*|-" line)
-        (setq new (mapcar (lambda (x) (if (member x '(?| ?+)) ?| ?\ )) line))
+	(setq new (mapcar (lambda (x) (if (member x '(?| ?+)) ?| ?\ )) line))
       (setq new (mapcar (lambda (x) (if (equal x ?|) ?| ?\ )) line)))
     ;; Fix the first field if necessary
     (setq new (concat new))
     (if (string-match "^[ \t]*| *[#$] *|" line)
-        (setq new (replace-match (match-string 0 line) t t new)))
+	(setq new (replace-match (match-string 0 line) t t new)))
     (beginning-of-line (if arg 2 1))
     (let (org-table-may-need-update)
       (insert-before-markers new)
@@ -6549,23 +6567,23 @@
   (if (not (org-at-table-p))
       (error "Not at a table"))
   (let ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
-        (col (current-column))
-        start)
+	(col (current-column))
+	start)
     (if (string-match "^[ \t]*|-" line)
-        (setq line
-              (mapcar (lambda (x) (if (member x '(?| ?+))
-                                      (prog1 (if start ?+ ?|) (setq start t))
-                                    (if start ?- ?\ )))
-                      line))
+	(setq line
+	      (mapcar (lambda (x) (if (member x '(?| ?+))
+				      (prog1 (if start ?+ ?|) (setq start t))
+				    (if start ?- ?\ )))
+		      line))
       (setq line
-            (mapcar (lambda (x) (if (equal x ?|)
-                                    (prog1 (if start ?+ ?|) (setq start t))
-                                    (if start ?- ?\ )))
-                    line)))
+	    (mapcar (lambda (x) (if (equal x ?|)
+				    (prog1 (if start ?+ ?|) (setq start t))
+				    (if start ?- ?\ )))
+		    line)))
     (beginning-of-line (if arg 1 2))
     (apply 'insert line)
     (if (equal (char-before (point)) ?+)
-        (progn (backward-delete-char 1) (insert "|")))
+	(progn (backward-delete-char 1) (insert "|")))
     (insert "\n")
     (beginning-of-line 0)
     (move-to-column col)))
@@ -6589,33 +6607,33 @@
 (defun org-table-copy-region (beg end &optional cut)
   "Copy rectangular region in table to clipboard.
 A special clipboard is used which can only be accessed
-with `org-table-paste-rectangle'."
+with `org-table-paste-rectangle'"
   (interactive "rP")
   (let* (l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2
-         region cols
-         (rpl (if cut "  " nil)))
+	 region cols
+	 (rpl (if cut "  " nil)))
     (goto-char beg)
     (org-table-check-inside-data-field)
     (setq l01 (count-lines (point-min) (point))
-          c01 (org-table-current-column))
+	  c01 (org-table-current-column))
     (goto-char end)
     (org-table-check-inside-data-field)
     (setq l02 (count-lines (point-min) (point))
-          c02 (org-table-current-column))
+	  c02 (org-table-current-column))
     (setq l1 (min l01 l02) l2 (max l01 l02)
-          c1 (min c01 c02) c2 (max c01 c02))
+	  c1 (min c01 c02) c2 (max c01 c02))
     (catch 'exit
       (while t
-        (catch 'nextline
-          (if (> l1 l2) (throw 'exit t))
-          (goto-line l1)
-          (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
-          (setq cols nil ic1 c1 ic2 c2)
-          (while (< ic1 (1+ ic2))
-            (push (org-table-get-field ic1 rpl) cols)
-            (setq ic1 (1+ ic1)))
-          (push (nreverse cols) region)
-          (setq l1 (1+ l1)))))
+	(catch 'nextline
+	  (if (> l1 l2) (throw 'exit t))
+	  (goto-line l1)
+	  (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1))))
+	  (setq cols nil ic1 c1 ic2 c2)
+	  (while (< ic1 (1+ ic2))
+	    (push (org-table-get-field ic1 rpl) cols)
+	    (setq ic1 (1+ ic1)))
+	  (push (nreverse cols) region)
+	  (setq l1 (1+ l1)))))
     (setq org-table-clip (nreverse region))
     (if cut (org-table-align))
     org-table-clip))
@@ -6631,20 +6649,20 @@
     (error "First cut/copy a region to paste!"))
   (org-table-check-inside-data-field)
   (let* ((clip org-table-clip)
-         (line (count-lines (point-min) (point)))
-         (col (org-table-current-column))
-         (org-enable-table-editor t)
-         (org-table-automatic-realign nil)
-         c cols field)
+	 (line (count-lines (point-min) (point)))
+	 (col (org-table-current-column))
+	 (org-enable-table-editor t)
+	 (org-table-automatic-realign nil)
+	 c cols field)
     (while (setq cols (pop clip))
       (while (org-at-table-hline-p) (beginning-of-line 2))
       (if (not (org-at-table-p))
-          (progn (end-of-line 0) (org-table-next-field)))
+	  (progn (end-of-line 0) (org-table-next-field)))
       (setq c col)
       (while (setq field (pop cols))
-        (org-table-goto-column c nil 'force)
-        (org-table-get-field nil field)
-        (setq c (1+ c)))
+	(org-table-goto-column c nil 'force)
+	(org-table-get-field nil field)
+	(setq c (1+ c)))
       (beginning-of-line 2))
     (goto-line line)
     (org-table-goto-column col)
@@ -6664,35 +6682,35 @@
   (if (org-at-table.el-p)
       ;; convert to Org-mode table
       (let ((beg (move-marker (make-marker) (org-table-begin t)))
-            (end (move-marker (make-marker) (org-table-end t))))
-        (table-unrecognize-region beg end)
-        (goto-char beg)
-        (while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t)
-          (replace-match ""))
-        (goto-char beg))
+	    (end (move-marker (make-marker) (org-table-end t))))
+	(table-unrecognize-region beg end)
+	(goto-char beg)
+	(while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t)
+	  (replace-match ""))
+	(goto-char beg))
     (if (org-at-table-p)
-        ;; convert to table.el table
-        (let ((beg (move-marker (make-marker) (org-table-begin)))
-              (end (move-marker (make-marker) (org-table-end))))
-          ;; first, get rid of all horizontal lines
-          (goto-char beg)
-          (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t)
-            (replace-match ""))
-          ;; insert a hline before first
-          (goto-char beg)
-          (org-table-insert-hline 'above)
-          ;; insert a hline after each line
-          (while (progn (beginning-of-line 2) (< (point) end))
-            (org-table-insert-hline))
-          (goto-char beg)
-          (setq end (move-marker end (org-table-end)))
-          ;; replace "+" at beginning and ending of hlines
-          (while (re-search-forward "^\\([ \t]*\\)|-" end t)
-            (replace-match "\\1+-"))
-          (goto-char beg)
-          (while (re-search-forward "-|[ \t]*$" end t)
-            (replace-match "-+"))
-          (goto-char beg)))))
+	;; convert to table.el table
+	(let ((beg (move-marker (make-marker) (org-table-begin)))
+	      (end (move-marker (make-marker) (org-table-end))))
+	  ;; first, get rid of all horizontal lines
+	  (goto-char beg)
+	  (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t)
+	    (replace-match ""))
+	  ;; insert a hline before first
+	  (goto-char beg)
+	  (org-table-insert-hline 'above)
+	  ;; insert a hline after each line
+	  (while (progn (beginning-of-line 2) (< (point) end))
+	    (org-table-insert-hline))
+	  (goto-char beg)
+	  (setq end (move-marker end (org-table-end)))
+	  ;; replace "+" at beginning and ending of hlines
+	  (while (re-search-forward "^\\([ \t]*\\)|-" end t)
+	    (replace-match "\\1+-"))
+	  (goto-char beg)
+	  (while (re-search-forward "-|[ \t]*$" end t)
+	    (replace-match "-+"))
+	  (goto-char beg)))))
 
 (defun org-table-wrap-region (arg)
   "Wrap several fields in a column like a paragraph.
@@ -6721,40 +6739,40 @@
   (if (org-region-active-p)
       ;; There is a region:  fill as a paragraph
       (let ((beg (region-beginning))
-            nlines)
-        (org-table-cut-region (region-beginning) (region-end))
-        (if (> (length (car org-table-clip)) 1)
-            (error "Region must be limited to single column"))
-        (setq nlines (if arg
-                         (if (< arg 1)
-                             (+ (length org-table-clip) arg)
-                           arg)
-                       (length org-table-clip)))
-        (setq org-table-clip
-              (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
-                                      nil nlines)))
-        (goto-char beg)
-        (org-table-paste-rectangle))
+	    nlines)
+	(org-table-cut-region (region-beginning) (region-end))
+	(if (> (length (car org-table-clip)) 1)
+	    (error "Region must be limited to single column"))
+	(setq nlines (if arg
+			 (if (< arg 1)
+			     (+ (length org-table-clip) arg)
+			   arg)
+		       (length org-table-clip)))
+	(setq org-table-clip
+	      (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ")
+				      nil nlines)))
+	(goto-char beg)
+	(org-table-paste-rectangle))
     ;; No region, split the current field at point
     (if arg
-        ;; combine with field above
-        (let ((s (org-table-blank-field))
-              (col (org-table-current-column)))
-          (beginning-of-line 0)
-          (while (org-at-table-hline-p) (beginning-of-line 0))
-          (org-table-goto-column col)
-          (skip-chars-forward "^|")
-          (skip-chars-backward " ")
-          (insert " " (org-trim s))
-          (org-table-align))
+	;; combine with field above
+	(let ((s (org-table-blank-field))
+	      (col (org-table-current-column)))
+	  (beginning-of-line 0)
+	  (while (org-at-table-hline-p) (beginning-of-line 0))
+	  (org-table-goto-column col)
+	  (skip-chars-forward "^|")
+	  (skip-chars-backward " ")
+	  (insert " " (org-trim s))
+	  (org-table-align))
       ;;  split field
       (when (looking-at "\\([^|]+\\)+|")
-        (let ((s (match-string 1)))
-          (replace-match " |")
-          (goto-char (match-beginning 0))
-          (org-table-next-row)
-          (insert (org-trim s) " ")
-          (org-table-align))))))
+	(let ((s (match-string 1)))
+	  (replace-match " |")
+	  (goto-char (match-beginning 0))
+	  (org-table-next-row)
+	  (insert (org-trim s) " ")
+	  (org-table-align))))))
 
 (defun org-trim (s)
   "Remove whitespace at beginning and end of string."
@@ -6771,21 +6789,21 @@
 many lines, whatever width that takes.
 The return value is a list of lines, without newlines at the end."
   (let* ((words (org-split-string string "[ \t\n]+"))
-         (maxword (apply 'max (mapcar 'length words)))
-         w ll)
+	 (maxword (apply 'max (mapcar 'length words)))
+	 w ll)
     (cond (width
-           (org-do-wrap words (max maxword width)))
-          (lines
-           (setq w maxword)
-           (setq ll (org-do-wrap words maxword))
-           (if (<= (length ll) lines)
-               ll
-             (setq ll words)
-             (while (> (length ll) lines)
-               (setq w (1+ w))
-               (setq ll (org-do-wrap words w)))
-             ll))
-          (t (error "Cannot wrap this")))))
+	   (org-do-wrap words (max maxword width)))
+	  (lines
+	   (setq w maxword)
+	   (setq ll (org-do-wrap words maxword))
+	   (if (<= (length ll) lines)
+	       ll
+	     (setq ll words)
+	     (while (> (length ll) lines)
+	       (setq w (1+ w))
+	       (setq ll (org-do-wrap words w)))
+	     ll))
+	  (t (error "Cannot wrap this")))))
 
 
 (defun org-do-wrap (words width)
@@ -6794,7 +6812,7 @@
     (while words
       (setq line (pop words))
       (while (and words (< (+ (length line) (length (car words))) width))
-        (setq line (concat line " " (pop words))))
+	(setq line (concat line " " (pop words))))
       (setq lines (push line lines)))
     (nreverse lines)))
 
@@ -6831,40 +6849,40 @@
   "Add an `invisible' property to vertical lines of current table."
   (interactive)
   (let* ((beg (org-table-begin))
-         (end (org-table-end))
-         (end1))
+	 (end (org-table-end))
+	 (end1))
     (save-excursion
       (goto-char beg)
       (while (< (point) end)
-        (setq end1 (point-at-eol))
-        (if (looking-at org-table-dataline-regexp)
-            (while (re-search-forward "|" end1 t)
-              (add-text-properties (1- (point)) (point)
-                                   '(invisible org-table)))
-          (while (re-search-forward "[+|]" end1 t)
-            (add-text-properties (1- (point)) (point)
-                                 '(invisible org-table))))
-        (beginning-of-line 2)))))
+	(setq end1 (point-at-eol))
+	(if (looking-at org-table-dataline-regexp)
+	    (while (re-search-forward "|" end1 t)
+	      (add-text-properties (1- (point)) (point)
+				   '(invisible org-table)))
+	  (while (re-search-forward "[+|]" end1 t)
+	    (add-text-properties (1- (point)) (point)
+				 '(invisible org-table))))
+	(beginning-of-line 2)))))
 
 (defun org-table-toggle-vline-visibility (&optional arg)
   "Toggle the visibility of table vertical lines.
 The effect is immediate and on all tables in the file.
 With prefix ARG, make lines invisible when ARG is positive, make lines
-visible when ARG is not positive."
+visible when ARG is not positive"
   (interactive "P")
   (let ((action (cond
-                 ((and arg (> (prefix-numeric-value arg) 0)) 'on)
-                 ((and arg (< (prefix-numeric-value arg) 1)) 'off)
-                 (t (if (org-in-invisibility-spec-p '(org-table))
-                        'off
-                      'on)))))
+		 ((and arg (> (prefix-numeric-value arg) 0)) 'on)
+		 ((and arg (< (prefix-numeric-value arg) 1)) 'off)
+		 (t (if (org-in-invisibility-spec-p '(org-table))
+			'off
+		      'on)))))
     (if (eq action 'off)
-        (progn
-          (org-remove-from-invisibility-spec '(org-table))
-          (org-table-map-tables 'org-table-align)
-          (message "Vertical table lines visible")
-          (if (org-at-table-p)
-              (org-table-align)))
+	(progn
+	  (org-remove-from-invisibility-spec '(org-table))
+	  (org-table-map-tables 'org-table-align)
+	  (message "Vertical table lines visible")
+	  (if (org-at-table-p)
+	      (org-table-align)))
       (org-add-to-invisibility-spec '(org-table))
       (org-table-map-tables 'org-table-align)
       (message "Vertical table lines invisible"))
@@ -6877,11 +6895,11 @@
       (widen)
       (goto-char (point-min))
       (while (re-search-forward org-table-any-line-regexp nil t)
-        (message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
-        (beginning-of-line 1)
-        (if (looking-at org-table-line-regexp)
-            (save-excursion (funcall function)))
-        (re-search-forward org-table-any-border-regexp nil 1)))))
+	(message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
+	(beginning-of-line 1)
+	(if (looking-at org-table-line-regexp)
+	    (save-excursion (funcall function)))
+	(re-search-forward org-table-any-border-regexp nil 1)))))
 
 (defun org-table-sum (&optional beg end nlast)
   "Sum numbers in region of current table column.
@@ -6904,61 +6922,61 @@
       (cond
        ((and beg end))   ; beg and end given explicitly
        ((org-region-active-p)
-        (setq beg (region-beginning) end (region-end)))
+	(setq beg (region-beginning) end (region-end)))
        (t
-        (setq col (org-table-current-column))
-        (goto-char (org-table-begin))
-        (unless (re-search-forward "^[ \t]*|[^-]" nil t)
-          (error "No table data"))
-        (org-table-goto-column col)
+	(setq col (org-table-current-column))
+	(goto-char (org-table-begin))
+	(unless (re-search-forward "^[ \t]*|[^-]" nil t)
+	  (error "No table data"))
+	(org-table-goto-column col)
 ;not needed?        (skip-chars-backward "^|")
-        (setq beg (point))
-        (goto-char (org-table-end))
-        (unless (re-search-backward "^[ \t]*|[^-]" nil t)
-          (error "No table data"))
-        (org-table-goto-column col)
+	(setq beg (point))
+	(goto-char (org-table-end))
+	(unless (re-search-backward "^[ \t]*|[^-]" nil t)
+	  (error "No table data"))
+	(org-table-goto-column col)
 ;not needed?        (skip-chars-forward "^|")
-        (setq end (point))))
+	(setq end (point))))
       (let* ((items (apply 'append (org-table-copy-region beg end)))
-             (items1 (cond ((not nlast) items)
-                           ((>= nlast (length items)) items)
-                           (t (setq items (reverse items))
-                              (setcdr (nthcdr (1- nlast) items) nil)
-                              (nreverse items))))
-             (numbers (delq nil (mapcar 'org-table-get-number-for-summing
-                                        items1)))
-             (res (apply '+ numbers))
-             (sres (if (= timecnt 0)
-                       (format "%g" res)
-                     (setq diff (* 3600 res)
-                           h (floor (/ diff 3600)) diff (mod diff 3600)
-                           m (floor (/ diff 60)) diff (mod diff 60)
-                           s diff)
-                     (format "%d:%02d:%02d" h m s))))
-        (kill-new sres)
-        (if (interactive-p)
-            (message (substitute-command-keys
-                      (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
-                              (length numbers) sres))))
-        sres))))
+	     (items1 (cond ((not nlast) items)
+			   ((>= nlast (length items)) items)
+			   (t (setq items (reverse items))
+			      (setcdr (nthcdr (1- nlast) items) nil)
+			      (nreverse items))))
+	     (numbers (delq nil (mapcar 'org-table-get-number-for-summing
+					items1)))
+	     (res (apply '+ numbers))
+	     (sres (if (= timecnt 0)
+		       (format "%g" res)
+		     (setq diff (* 3600 res)
+			   h (floor (/ diff 3600)) diff (mod diff 3600)
+			   m (floor (/ diff 60)) diff (mod diff 60)
+			   s diff)
+		     (format "%d:%02d:%02d" h m s))))
+	(kill-new sres)
+	(if (interactive-p)
+	    (message (substitute-command-keys
+		      (format "Sum of %d items: %-20s     (\\[yank] will insert result into buffer)"
+			      (length numbers) sres))))
+	sres))))
 
 (defun org-table-get-number-for-summing (s)
   (let (n)
     (if (string-match "^ *|? *" s)
-        (setq s (replace-match "" nil nil s)))
+	(setq s (replace-match "" nil nil s)))
     (if (string-match " *|? *$" s)
-        (setq s (replace-match "" nil nil s)))
+	(setq s (replace-match "" nil nil s)))
     (setq n (string-to-number s))
     (cond
      ((and (string-match "0" s)
-           (string-match "\\`[-+ \t0.edED]+\\'" s)) 0)
+	   (string-match "\\`[-+ \t0.edED]+\\'" s)) 0)
      ((string-match "\\`[ \t]+\\'" s)         nil)
      ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?\\'" s)
       (let ((h (string-to-number (or (match-string 1 s) "0")))
-            (m (string-to-number (or (match-string 2 s) "0")))
-            (s (string-to-number (or (match-string 4 s) "0"))))
-        (if (boundp 'timecnt) (setq timecnt (1+ timecnt)))
-        (* 1.0 (+ h (/ m 60.0) (/ s 3600.0)))))
+	    (m (string-to-number (or (match-string 2 s) "0")))
+	    (s (string-to-number (or (match-string 4 s) "0"))))
+	(if (boundp 'timecnt) (setq timecnt (1+ timecnt)))
+	(* 1.0 (+ h (/ m 60.0) (/ s 3600.0)))))
      ((equal n 0)                             nil)
      (t n))))
 
@@ -6967,25 +6985,26 @@
 (defun org-table-get-formula (&optional equation)
   "Read a formula from the minibuffer, offer stored formula as default."
   (let* ((col (org-table-current-column))
-         (stored-list (org-table-get-stored-formulas))
-         (stored (cdr (assoc col stored-list)))
-         (eq (cond
-              ((and stored equation (string-match "^ *= *$" equation))
-               stored)
-              ((stringp equation)
-               equation)
-              (t (read-string
-                  "Formula: " (or stored "") 'org-table-formula-history
-                  stored)))))
+	 (org-table-may-need-update nil)
+	 (stored-list (org-table-get-stored-formulas))
+	 (stored (cdr (assoc col stored-list)))
+	 (eq (cond
+	      ((and stored equation (string-match "^ *= *$" equation))
+	       stored)
+	      ((stringp equation)
+	       equation)
+	      (t (read-string
+		  "Formula: " (or stored "") 'org-table-formula-history
+		  stored)))))
     (if (not (string-match "\\S-" eq))
-        (error "Empty formula"))
+	(error "Empty formula"))
     (if (string-match "^ *=?" eq) (setq eq (replace-match "" t t eq)))
     (if (string-match " *$" eq) (setq eq (replace-match "" t t eq)))
     (if stored
-        (setcdr (assoc col stored-list) eq)
+	(setcdr (assoc col stored-list) eq)
       (setq stored-list (cons (cons col eq) stored-list)))
     (if (not (equal stored eq))
-        (org-table-store-formulas stored-list))
+	(org-table-store-formulas stored-list))
     eq))
 
 (defun org-table-store-formulas (alist)
@@ -6994,26 +7013,26 @@
   (save-excursion
     (goto-char (org-table-end))
     (if (looking-at "\\([ \t]*\n\\)*#\\+TBLFM:.*\n?")
-        (delete-region (point) (match-end 0)))
+	(delete-region (point) (match-end 0)))
     (insert "#+TBLFM: "
-            (mapconcat (lambda (x)
-                         (concat "$" (int-to-string (car x)) "=" (cdr x)))
-                       alist "::")
-            "\n")))
+	    (mapconcat (lambda (x)
+			 (concat "$" (int-to-string (car x)) "=" (cdr x)))
+		       alist "::")
+	    "\n")))
 
 (defun org-table-get-stored-formulas ()
-  "Return an alist with the stored formulas directly after current table."
+  "Return an alist withh the t=stored formulas directly after current table."
   (interactive)
   (let (col eq eq-alist strings string)
     (save-excursion
       (goto-char (org-table-end))
       (when (looking-at "\\([ \t]*\n\\)*#\\+TBLFM: *\\(.*\\)")
-        (setq strings (org-split-string (match-string 2) " *:: *"))
-        (while (setq string (pop strings))
-          (if (string-match "\\$\\([0-9]+\\) *= *\\(.*[^ \t]\\)" string)
-              (setq col (string-to-number (match-string 1 string))
-                    eq (match-string 2 string)
-                    eq-alist (cons (cons col eq) eq-alist))))))
+	(setq strings (org-split-string (match-string 2) " *:: *"))
+	(while (setq string (pop strings))
+	  (if (string-match "\\$\\([0-9]+\\) *= *\\(.*[^ \t]\\)" string)
+	      (setq col (string-to-number (match-string 1 string))
+		    eq (match-string 2 string)
+		    eq-alist (cons (cons col eq) eq-alist))))))
     eq-alist))
 
 (defun org-table-modify-formulas (action &rest columns)
@@ -7021,9 +7040,9 @@
 ACTION can be `remove', `insert', `swap'.  For `swap', two column numbers are
 expected, for the other action only a single column number is needed."
   (let ((list (org-table-get-stored-formulas))
-        (nmax (length (org-split-string (buffer-substring (point-at-bol) (point-at-eol))
-                                        "|")))
-        col col1 col2)
+	(nmax (length (org-split-string (buffer-substring (point-at-bol) (point-at-eol))
+					"|")))
+	col col1 col2)
     (cond
      ((null list))   ; No action needed if there are no stored formulas
      ((eq action 'remove)
@@ -7031,13 +7050,13 @@
       (org-table-replace-in-formulas list col "INVALID")
       (if (assoc col list) (setq list (delq (assoc col list) list)))
       (loop for i from (1+ col) upto nmax by 1 do
-            (org-table-replace-in-formulas list i (1- i))
-            (if (assoc i list) (setcar (assoc i list) (1- i)))))
+	    (org-table-replace-in-formulas list i (1- i))
+	    (if (assoc i list) (setcar (assoc i list) (1- i)))))
      ((eq action 'insert)
       (setq col (car columns))
       (loop for i from nmax downto col by 1 do
-            (org-table-replace-in-formulas list i (1+ i))
-            (if (assoc i list) (setcar (assoc i list) (1+ i)))))
+	    (org-table-replace-in-formulas list i (1+ i))
+	    (if (assoc i list) (setcar (assoc i list) (1+ i)))))
      ((eq action 'swap)
       (setq col1 (car columns) col2 (nth 1 columns))
       (org-table-replace-in-formulas list col1 "Z")
@@ -7052,12 +7071,12 @@
 (defun org-table-replace-in-formulas (list s1 s2)
   (let (elt re s)
     (setq s1 (concat "$" (if (integerp s1) (int-to-string s1) s1))
-          s2 (concat "$" (if (integerp s2) (int-to-string s2) s2))
-          re (concat (regexp-quote s1) "\\>"))
+	  s2 (concat "$" (if (integerp s2) (int-to-string s2) s2))
+	  re (concat (regexp-quote s1) "\\>"))
     (while (setq elt (pop list))
       (setq s (cdr elt))
       (while (string-match re s)
-        (setq s (replace-match s2 t t s)))
+	(setq s (replace-match s2 t t s)))
       (setcdr elt s))))
 
 (defvar org-table-column-names nil
@@ -7068,36 +7087,49 @@
   "Alist with parameter names, derived from the `$' line.")
 
 (defun org-table-get-specials ()
-  "Get the column names and local parameters for this table."
+  "Get the column nmaes and local parameters for this table."
   (save-excursion
     (let ((beg (org-table-begin)) (end (org-table-end))
-          names name fields field cnt)
+	  names name fields fields1 field cnt c v)
       (setq org-table-column-names nil
-            org-table-local-parameters nil)
+	    org-table-local-parameters nil)
       (goto-char beg)
       (when (re-search-forward "^[ \t]*| *! *\\(|.*\\)" end t)
-        (setq names (org-split-string (match-string 1) " *| *")
-              cnt 1)
-        (while (setq name (pop names))
-          (setq cnt (1+ cnt))
-          (if (string-match "^[a-zA-Z][a-zA-Z0-9]*$" name)
-              (push (cons name (int-to-string cnt)) org-table-column-names))))
+	(setq names (org-split-string (match-string 1) " *| *")
+	      cnt 1)
+	(while (setq name (pop names))
+	  (setq cnt (1+ cnt))
+	  (if (string-match "^[a-zA-Z][a-zA-Z0-9]*$" name)
+	      (push (cons name (int-to-string cnt)) org-table-column-names))))
       (setq org-table-column-names (nreverse org-table-column-names))
       (setq org-table-column-name-regexp
-            (concat "\\$\\(" (mapconcat 'car org-table-column-names "\\|") "\\)\\>"))
+	    (concat "\\$\\(" (mapconcat 'car org-table-column-names "\\|") "\\)\\>"))
       (goto-char beg)
       (while (re-search-forward "^[ \t]*| *\\$ *\\(|.*\\)" end t)
-        (setq fields (org-split-string (match-string 1) " *| *"))
-        (while (setq field (pop fields))
-          (if (string-match "^\\([a-zA-Z][a-zA-Z0-9]*\\) *= *\\(.*\\)" field)
-              (push (cons (match-string 1 field) (match-string 2 field))
-                    org-table-local-parameters)))))))
+	(setq fields (org-split-string (match-string 1) " *| *"))
+	(while (setq field (pop fields))
+	  (if (string-match "^\\([a-zA-Z][a-zA-Z0-9]*\\|%\\) *= *\\(.*\\)" field)
+	      (push (cons (match-string 1 field) (match-string 2 field))
+		    org-table-local-parameters))))
+      (goto-char beg)
+      (while (re-search-forward "^[ \t]*| *\\([_^]\\) *\\(|.*\\)" end t)
+	(setq c (match-string 1)
+	      fields (org-split-string (match-string 2) " *| *"))
+	(save-excursion
+	  (beginning-of-line (if (equal c "_") 2 0))
+	  (and (looking-at "^[ \t]*|[^|]*\\(|.*\\)")
+	       (setq fields1 (org-split-string (match-string 1) " *| *"))))
+	(while (setq field (pop fields))
+	  (setq v (pop fields1))
+	  (if (and (stringp field) (stringp v)
+		   (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
+	      (push (cons field v) org-table-local-parameters)))))))
 
 (defun org-this-word ()
   ;; Get the current word
   (save-excursion
     (let ((beg (progn (skip-chars-backward "^ \t\n") (point)))
-          (end (progn (skip-chars-forward "^ \t\n") (point))))
+	  (end (progn (skip-chars-forward "^ \t\n") (point))))
       (buffer-substring-no-properties beg end))))
 
 (defun org-table-maybe-eval-formula ()
@@ -7106,35 +7138,35 @@
   ;; when appropriate.  It might return a separator line, but no problem.
   (when org-table-formula-evaluate-inline
     (let* ((field (org-trim (or (org-table-get-field) "")))
-           (dfield (downcase field))
-           col bolpos nlast)
+	   (dfield (downcase field))
+	   col bolpos nlast)
       (when (equal (string-to-char field) ?=)
-        (if (string-match "^\\(=sum[vh]?\\)\\([0-9]+\\)$" dfield)
-            (setq nlast (1+ (string-to-number (match-string 2 dfield)))
-                  dfield (match-string 1 dfield)))
-        (cond
-         ((equal dfield "=sumh")
-          (org-table-get-field
-           nil (org-table-sum
-                (save-excursion (org-table-goto-column 1) (point))
-                (point) nlast)))
-         ((member dfield '("=sum" "=sumv"))
-          (setq col (org-table-current-column)
-                bolpos (point-at-bol))
-          (org-table-get-field
-           nil (org-table-sum
-                (save-excursion
-                  (goto-char (org-table-begin))
-                  (if (re-search-forward org-table-dataline-regexp bolpos t)
-                      (progn
-                        (goto-char (match-beginning 0))
-                        (org-table-goto-column col)
-                        (point))
-                    (error "No datalines above current")))
-                (point) nlast)))
-         ((and (string-match "^ *=" field)
+	(if (string-match "^\\(=sum[vh]?\\)\\([0-9]+\\)$" dfield)
+	    (setq nlast (1+ (string-to-number (match-string 2 dfield)))
+		  dfield (match-string 1 dfield)))
+	(cond
+	 ((equal dfield "=sumh")
+	  (org-table-get-field
+	   nil (org-table-sum
+		(save-excursion (org-table-goto-column 1) (point))
+		(point) nlast)))
+	 ((member dfield '("=sum" "=sumv"))
+	  (setq col (org-table-current-column)
+		bolpos (point-at-bol))
+	  (org-table-get-field
+	   nil (org-table-sum
+		(save-excursion
+		  (goto-char (org-table-begin))
+		  (if (re-search-forward org-table-dataline-regexp bolpos t)
+		      (progn
+			(goto-char (match-beginning 0))
+			(org-table-goto-column col)
+			(point))
+		    (error "No datalines above current")))
+		(point) nlast)))
+	 ((and (string-match "^ *=" field)
 	       (fboundp 'calc-eval))
-          (org-table-eval-formula nil field)))))))
+	  (org-table-eval-formula nil field)))))))
 
 (defvar org-last-recalc-undo-list nil)
 (defcustom org-table-allow-line-recalculation t
@@ -7143,7 +7175,7 @@
   :type 'boolean)
 
 (defvar org-recalc-commands nil
-  "List of commands triggering the recalculation of a line.
+  "List of commands triggering the reccalculation of a line.
 Will be filled automatically during use.")
 
 (defvar org-recalc-marks
@@ -7151,7 +7183,9 @@
     ("#" . "Automatically recalculate this line upon TAB, RET, and C-c C-c in the line")
     ("*" . "Recalculate only when entire table is recalculated with `C-u C-c *'")
     ("!" . "Column name definition line. Reference in formula as $name.")
-    ("$" . "Parameter definition line name=value. Reference in formula as $name.")))
+    ("$" . "Parameter definition line name=value. Reference in formula as $name.")
+    ("_" . "Names for values in row below this one.")
+    ("^" . "Names for values in row above this one.")))
 
 (defun org-table-rotate-recalc-marks (&optional newchar)
   "Rotate the recalculation mark in the first column.
@@ -7164,28 +7198,28 @@
   (interactive)
   (unless (org-at-table-p) (error "Not at a table"))
   (let* ((marks (append (mapcar 'car org-recalc-marks) '(" ")))
-         (beg (org-table-begin))
-         (end (org-table-end))
-         (l (org-current-line))
-         (l1 (if (org-region-active-p) (org-current-line (region-beginning))))
-         (l2 (if (org-region-active-p) (org-current-line (region-end))))
-         (have-col
-          (save-excursion
-            (goto-char beg)
-            (not (re-search-forward "^[ \t]*|[^-|][^|]*[^#!$*| \t][^|]*|" end t))))
-         (col (org-table-current-column))
-         (forcenew (car (assoc newchar org-recalc-marks)))
-         epos new)
+	 (beg (org-table-begin))
+	 (end (org-table-end))
+	 (l (org-current-line))
+	 (l1 (if (org-region-active-p) (org-current-line (region-beginning))))
+	 (l2 (if (org-region-active-p) (org-current-line (region-end))))
+	 (have-col
+	  (save-excursion
+	    (goto-char beg)
+	    (not (re-search-forward "^[ \t]*|[^-|][^|]*[^#!$*_^| \t][^|]*|" end t))))
+	 (col (org-table-current-column))
+	 (forcenew (car (assoc newchar org-recalc-marks)))
+	 epos new)
     (if l1 (setq newchar (char-to-string (read-char-exclusive "Change region to what mark?  Type # * ! $ or SPC: "))
-                 forcenew (car (assoc newchar org-recalc-marks))))
+		 forcenew (car (assoc newchar org-recalc-marks))))
     (if (and newchar (not forcenew))
-        (error "Invalid NEWCHAR `%s' in `org-table-rotate-recalc-marks'"
-               newchar))
+	(error "Invalid NEWCHAR `%s' in `org-table-rotate-recalc-marks'"
+	       newchar))
     (if l1 (goto-line l1))
     (save-excursion
       (beginning-of-line 1)
       (unless (looking-at org-table-dataline-regexp)
-        (error "Not at a table data line")))
+	(error "Not at a table data line")))
     (unless have-col
       (org-table-goto-column 1)
       (org-table-insert-column)
@@ -7194,19 +7228,19 @@
     (save-excursion
       (beginning-of-line 1)
       (org-table-get-field
-       1 (if (looking-at "^[ \t]*| *\\([#!$* ]\\) *|")
-             (concat " "
-                     (setq new (or forcenew
-                                   (cadr (member (match-string 1) marks))))
-                     " ")
-           " # ")))
+       1 (if (looking-at "^[ \t]*| *\\([#!$*^_ ]\\) *|")
+	     (concat " "
+		     (setq new (or forcenew
+				   (cadr (member (match-string 1) marks))))
+		     " ")
+	   " # ")))
     (if (and l1 l2)
-        (progn
-          (goto-line l1)
-          (while (progn (beginning-of-line 2) (not (= (org-current-line) l2)))
-            (and (looking-at org-table-dataline-regexp)
-                 (org-table-get-field 1 (concat " " new " "))))
-          (goto-line l1)))
+	(progn
+	  (goto-line l1)
+	  (while (progn (beginning-of-line 2) (not (= (org-current-line) l2)))
+	    (and (looking-at org-table-dataline-regexp)
+		 (org-table-get-field 1 (concat " " new " "))))
+	  (goto-line l1)))
     (if (not (= epos (point-at-eol))) (org-table-align))
     (goto-line l)
     (and (interactive-p) (message (cdr (assoc new org-recalc-marks))))))
@@ -7216,9 +7250,9 @@
   (interactive)
   (and org-table-allow-line-recalculation
        (not (and (memq last-command org-recalc-commands)
-                 (equal org-last-recalc-line (org-current-line))))
+		 (equal org-last-recalc-line (org-current-line))))
        (save-excursion (beginning-of-line 1)
-                       (looking-at org-table-auto-recalculate-regexp))
+		       (looking-at org-table-auto-recalculate-regexp))
        (fboundp 'calc-eval)
        (org-table-recalculate) t))
 
@@ -7227,12 +7261,21 @@
 When nil, simply write \"#ERROR\" in corrupted fields.")
 
 (defvar modes)
-(defsubst org-set-calc-mode (var value)
-  (setcar (or (cdr (memq var modes)) (cons nil nil)) value))
+(defsubst org-set-calc-mode (var &optional value)
+  (if (stringp var)
+      (setq var (assoc var '(("D" calc-angle-mode deg)
+			     ("R" calc-angle-mode rad)
+			     ("F" calc-prefer-frac t)
+			     ("S" calc-symbolic-mode t)))
+	    value (nth 2 var) var (nth 1 var)))
+  (if (memq var modes)
+      (setcar (cdr (memq var modes)) value)
+    (cons var (cons value modes)))
+  modes)
 
 (defun org-table-eval-formula (&optional ndown equation
-                                         suppress-align suppress-const
-                                         suppress-store)
+					 suppress-align suppress-const
+					 suppress-store)
   "Replace the table field value at the cursor by the result of a calculation.
 
 This function makes use of Dave Gillespie's calc package, in my view the
@@ -7265,7 +7308,7 @@
   $1+$2;%.2f          Same, and format result to two digits after dec.point
   exp($2)+exp($1)     Math functions can be used
   $;%.1f              Reformat current cell to 1 digit after dec.point
-  ($3-32)*5/9         Degrees F -> C conversion
+  ($3-32)*5/9         degrees F -> C conversion
 
 When called with a raw \\[universal-argument] prefix, the formula is applied to the current
 field, and to the same same column in all following rows, until reaching a
@@ -7287,94 +7330,91 @@
   (org-table-check-inside-data-field)
   (org-table-get-specials)
   (let* (fields
-         (org-table-automatic-realign nil)
-         (case-fold-search nil)
-         (down (> ndown 1))
-         (formula (if (and equation suppress-store)
-                      equation
-                    (org-table-get-formula equation)))
-         (n0 (org-table-current-column))
-         (modes (copy-sequence org-calc-default-modes))
-         n form fmt x ev orig c)
-    ;; Parse the format
+	 (org-table-automatic-realign nil)
+	 (case-fold-search nil)
+	 (down (> ndown 1))
+	 (formula (if (and equation suppress-store)
+		      equation
+		    (org-table-get-formula equation)))
+	 (n0 (org-table-current-column))
+	 (modes (copy-sequence org-calc-default-modes))
+	 n form fmt x ev orig c)
+    ;; Parse the format string.  Since we have a lot of modes, this is
+    ;; a lot of work.
     (if (string-match ";" formula)
-        (let ((tmp (org-split-string formula ";")))
-          (setq formula (car tmp) fmt (or (nth 1 tmp) ""))
-          (while (string-match "[pnfse]\\(-?[0-9]+\\)" fmt)
-            (setq c (string-to-char (match-string 1 fmt))
-                  n (string-to-number (or (match-string 1 fmt) "")))
-            (if (= c ?p) (org-set-calc-mode 'calc-internal-prec n)
-              (org-set-calc-mode 'calc-float-format
-                                 (list (cdr (assoc c '((?n. float) (?f. fix)
-                                                       (?s. sci) (?e. eng))))
-                                       n)))
-            (setq fmt (replace-match "" t t fmt)))
-          (when (string-match "[DR]" fmt)
-            (org-set-calc-mode 'calc-angle-mode
-                               (if (equal (match-string 0 fmt) "D")
-                                   'deg 'rad))
-            (setq fmt (replace-match "" t t fmt)))
-          (when (string-match "F" fmt)
-            (org-set-calc-mode 'calc-prefer-frac t)
-            (setq fmt (replace-match "" t t fmt)))
-          (when (string-match "S" fmt)
-            (org-set-calc-mode 'calc-symbolic-mode t)
-            (setq fmt (replace-match "" t t fmt)))
-          (unless (string-match "\\S-" fmt)
-            (setq fmt nil))))
+	(let ((tmp (org-split-string formula ";")))
+	  (setq formula (car tmp)
+		fmt (concat (cdr (assoc "%" org-table-local-parameters))
+			    (nth 1 tmp)))
+	  (while (string-match "[pnfse]\\(-?[0-9]+\\)" fmt)
+	    (setq c (string-to-char (match-string 1 fmt))
+		  n (string-to-number (or (match-string 1 fmt) "")))
+	    (if (= c ?p) (setq modes (org-set-calc-mode 'calc-internal-prec n))
+	      (setq modes (org-set-calc-mode
+			   'calc-float-format
+			   (list (cdr (assoc c '((?n. float) (?f. fix)
+						 (?s. sci) (?e. eng))))
+				 n))))
+	    (setq fmt (replace-match "" t t fmt)))
+	  (while (string-match "[DRFS]" fmt)
+	    (setq modes (org-set-calc-mode (match-string 0 fmt)))
+	    (setq fmt (replace-match "" t t fmt)))
+	  (unless (string-match "\\S-" fmt)
+	    (setq fmt nil))))
     (if (and (not suppress-const) org-table-formula-use-constants)
-        (setq formula (org-table-formula-substitute-names formula)))
+	(setq formula (org-table-formula-substitute-names formula)))
     (setq orig (or (get-text-property 1 :orig-formula formula) "?"))
     (while (> ndown 0)
       (setq fields (org-split-string
-                    (buffer-substring
-                     (point-at-bol) (point-at-eol)) " *| *"))
+		    (buffer-substring
+		     (point-at-bol) (point-at-eol)) " *| *"))
       (if org-table-formula-numbers-only
-          (setq fields (mapcar
-                        (lambda (x) (number-to-string (string-to-number x)))
-                        fields)))
+	  (setq fields (mapcar
+			(lambda (x) (number-to-string (string-to-number x)))
+			fields)))
       (setq ndown (1- ndown))
       (setq form (copy-sequence formula))
       (while (string-match "\\$\\([0-9]+\\)?" form)
-        (setq n (if (match-beginning 1)
-                    (string-to-int (match-string 1 form))
-                  n0)
-              x (nth (1- n) fields))
-        (unless x (error "Invalid field specifier \"%s\""
-                         (match-string 0 form)))
-        (if (equal x "") (setq x "0"))
-        (setq form (replace-match (concat "(" x ")") t t form)))
+	(setq n (if (match-beginning 1)
+		    (string-to-int (match-string 1 form))
+		  n0)
+	      x (nth (1- n) fields))
+	(unless x (error "Invalid field specifier \"%s\""
+			 (match-string 0 form)))
+	(if (equal x "") (setq x "0"))
+	(setq form (replace-match (concat "(" x ")") t t form)))
       (setq ev (calc-eval (cons form modes)
-                          (if org-table-formula-numbers-only 'num)))
+			  (if org-table-formula-numbers-only 'num)))
 
       (when org-table-formula-debug
-        (with-output-to-temp-buffer "*Help*"
-          (princ (format "Substitution history of formula
+	(with-output-to-temp-buffer "*Help*"
+	  (princ (format "Substitution history of formula
 Orig:   %s
 $xyz->  %s
 $1->    %s\n" orig formula form))
-          (if (listp ev)
-              (princ (format "       %s^\nError:  %s"
-                             (make-string (car ev) ?\-) (nth 1 ev)))
-            (princ (format "Result: %s" ev))))
-        (shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
-        (unless (and (interactive-p) (not ndown))
-          (unless (let (inhibit-redisplay)
-                    (y-or-n-p "Debugging Formula. Continue to next? "))
-            (org-table-align)
-            (error "Abort"))
-          (delete-window (get-buffer-window "*Help*"))
-          (message "")))
-      (if (listp ev)
-          (setq fmt nil ev "#ERROR"))
-      (org-table-blank-field)
-      (if fmt
-          (insert (format fmt (string-to-number ev)))
-        (insert ev))
+	  (if (listp ev)
+	      (princ (format "       %s^\nError:  %s"
+			     (make-string (car ev) ?\-) (nth 1 ev)))
+	    (princ (format "Result: %s\nFormat: %s\nFinal:  %s"
+			   ev (or fmt "NONE")
+			   (if fmt (format fmt (string-to-number ev)) ev)))))
+	(shrink-window-if-larger-than-buffer (get-buffer-window "*Help*"))
+	(unless (and (interactive-p) (not ndown))
+	  (unless (let (inhibit-redisplay)
+		    (y-or-n-p "Debugging Formula. Continue to next? "))
+	    (org-table-align)
+	    (error "Abort"))
+	  (delete-window (get-buffer-window "*Help*"))
+	  (message "")))
+      (if (listp ev) (setq fmt nil ev "#ERROR"))
+      (org-table-justify-field-maybe
+       (if fmt (format fmt (string-to-number ev)) ev))
       (if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]"))
-          (call-interactively 'org-return)
-        (setq ndown 0)))
-    (or suppress-align (org-table-align))))
+	  (call-interactively 'org-return)
+	(setq ndown 0)))
+    (and down (org-table-maybe-recalculate-line))
+    (or suppress-align (and org-table-may-need-update
+			    (org-table-align)))))
 
 (defun org-table-recalculate (&optional all noalign)
   "Recalculate the current table line by applying all stored formulas."
@@ -7384,51 +7424,51 @@
   (unless (org-at-table-p) (error "Not at a table"))
   (org-table-get-specials)
   (let* ((eqlist (sort (org-table-get-stored-formulas)
-                       (lambda (a b) (< (car a) (car b)))))
-         (inhibit-redisplay t)
-         (line-re org-table-dataline-regexp)
-         (thisline (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
-         (thiscol (org-table-current-column))
-         beg end entry eql (cnt 0))
+		       (lambda (a b) (< (car a) (car b)))))
+	 (inhibit-redisplay t)
+	 (line-re org-table-dataline-regexp)
+	 (thisline (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
+	 (thiscol (org-table-current-column))
+	 beg end entry eql (cnt 0))
     ;; Insert constants in all formulas
     (setq eqlist
-          (mapcar (lambda (x)
-                    (setcdr x (org-table-formula-substitute-names (cdr x)))
-                    x)
-                  eqlist))
+	  (mapcar (lambda (x)
+		    (setcdr x (org-table-formula-substitute-names (cdr x)))
+		    x)
+		  eqlist))
     (if all
-        (progn
-          (setq end (move-marker (make-marker) (1+ (org-table-end))))
-          (goto-char (setq beg (org-table-begin)))
-          (if (re-search-forward org-table-recalculate-regexp end t)
-              (setq line-re org-table-recalculate-regexp)
-            (if (and (re-search-forward org-table-dataline-regexp end t)
-                     (re-search-forward org-table-hline-regexp end t)
-                     (re-search-forward org-table-dataline-regexp end t))
-                (setq beg (match-beginning 0))
-              nil))) ;; just leave beg where it is
+	(progn
+	  (setq end (move-marker (make-marker) (1+ (org-table-end))))
+	  (goto-char (setq beg (org-table-begin)))
+	  (if (re-search-forward org-table-recalculate-regexp end t)
+	      (setq line-re org-table-recalculate-regexp)
+	    (if (and (re-search-forward org-table-dataline-regexp end t)
+		     (re-search-forward org-table-hline-regexp end t)
+		     (re-search-forward org-table-dataline-regexp end t))
+		(setq beg (match-beginning 0))
+	      nil))) ;; just leave beg where it is
       (setq beg (point-at-bol)
-            end (move-marker (make-marker) (1+ (point-at-eol)))))
+	    end (move-marker (make-marker) (1+ (point-at-eol)))))
     (goto-char beg)
     (and all (message "Re-applying formulas to full table..."))
     (while (re-search-forward line-re end t)
       (unless (string-match "^ *[!$] *$" (org-table-get-field 1))
-        ;; Unprotected line, recalculate
-        (and all (message "Re-applying formulas to full table...(line %d)"
-                          (setq cnt (1+ cnt))))
-        (setq org-last-recalc-line (org-current-line))
-        (setq eql eqlist)
-        (while (setq entry (pop eql))
-          (goto-line org-last-recalc-line)
-          (org-table-goto-column (car entry) nil 'force)
-          (org-table-eval-formula nil (cdr entry) 'noalign 'nocst 'nostore))))
+	;; Unprotected line, recalculate
+	(and all (message "Re-applying formulas to full table...(line %d)"
+			  (setq cnt (1+ cnt))))
+	(setq org-last-recalc-line (org-current-line))
+	(setq eql eqlist)
+	(while (setq entry (pop eql))
+	  (goto-line org-last-recalc-line)
+	  (org-table-goto-column (car entry) nil 'force)
+	  (org-table-eval-formula nil (cdr entry) 'noalign 'nocst 'nostore))))
     (goto-line thisline)
     (org-table-goto-column thiscol)
-    (or noalign (org-table-align)
-        (and all (message "Re-applying formulas to %d lines...done" cnt)))))
+    (or noalign (and org-table-may-need-update (org-table-align))
+	(and all (message "Re-applying formulas to %d lines...done" cnt)))))
 
 (defun org-table-formula-substitute-names (f)
-  "Replace $const with values in string F."
+  "Replace $const with values in stirng F."
   (let ((start 0) a n1 n2 nn1 nn2 s (f1 f))
     ;; First, check for column names
     (while (setq start (string-match org-table-column-name-regexp f start))
@@ -7438,11 +7478,11 @@
     ;; Expand ranges to vectors
     (while (string-match "\\$\\([0-9]+\\)\\.\\.\\.?\\$\\([0-9]+\\)" f)
       (setq n1 (string-to-number (match-string 1 f))
-            n2 (string-to-number (match-string 2 f))
-            nn1 (1+ (min n1 n2)) nn2 (max n1 n2)
-            s (concat "[($" (number-to-string (1- nn1)) ")"))
+	    n2 (string-to-number (match-string 2 f))
+	    nn1 (1+ (min n1 n2)) nn2 (max n1 n2)
+	    s (concat "[($" (number-to-string (1- nn1)) ")"))
       (loop for i from nn1 upto nn2 do
-            (setq s (concat s ",($" (int-to-string i) ")")))
+	    (setq s (concat s ",($" (int-to-string i) ")")))
       (setq s (concat s "]"))
       (if (< n2 n1) (setq s (concat "rev(" s ")")))
       (setq f (replace-match s t t f)))
@@ -7451,10 +7491,10 @@
     (while (setq start (string-match "\\$\\([a-zA-Z][a-zA-Z0-9]*\\)" f start))
       (setq start (1+ start))
       (if (setq a (save-match-data
-                    (org-table-get-constant (match-string 1 f))))
-          (setq f (replace-match (concat "(" a ")") t t f))))
+		    (org-table-get-constant (match-string 1 f))))
+	  (setq f (replace-match (concat "(" a ")") t t f))))
     (if org-table-formula-debug
-        (put-text-property 0 (length f) :orig-formula f1 f))
+	(put-text-property 0 (length f) :orig-formula f1 f))
     f))
 
 (defun org-table-get-constant (const)
@@ -7529,26 +7569,26 @@
       ;; by accident in org-mode.
       (message "Orgtbl-mode is not useful in org-mode, command ignored")
     (setq orgtbl-mode
-          (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode)))
+	  (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode)))
     (if orgtbl-mode
-        (progn
-          (and (orgtbl-setup) (defun orgtbl-setup () nil))
-          ;; Make sure we are first in minor-mode-map-alist
-          (let ((c (assq 'orgtbl-mode minor-mode-map-alist)))
-            (and c (setq minor-mode-map-alist
-                         (cons c (delq c minor-mode-map-alist)))))
-          (set (make-local-variable (quote org-table-may-need-update)) t)
-          (make-local-hook (quote before-change-functions))
-          (add-hook 'before-change-functions 'org-before-change-function
-                    nil 'local)
-          (set (make-local-variable 'org-old-auto-fill-inhibit-regexp)
-               auto-fill-inhibit-regexp)
-          (set (make-local-variable 'auto-fill-inhibit-regexp)
-               (if auto-fill-inhibit-regexp
-                   (concat "\\([ \t]*|\\|" auto-fill-inhibit-regexp)
-                 "[ \t]*|"))
-          (easy-menu-add orgtbl-mode-menu)
-          (run-hooks 'orgtbl-mode-hook))
+	(progn
+	  (and (orgtbl-setup) (defun orgtbl-setup () nil))
+	  ;; Make sure we are first in minor-mode-map-alist
+	  (let ((c (assq 'orgtbl-mode minor-mode-map-alist)))
+	    (and c (setq minor-mode-map-alist
+			 (cons c (delq c minor-mode-map-alist)))))
+	  (set (make-local-variable (quote org-table-may-need-update)) t)
+	  (make-local-hook (quote before-change-functions))
+	  (add-hook 'before-change-functions 'org-before-change-function
+		    nil 'local)
+	  (set (make-local-variable 'org-old-auto-fill-inhibit-regexp)
+	       auto-fill-inhibit-regexp)
+	  (set (make-local-variable 'auto-fill-inhibit-regexp)
+	       (if auto-fill-inhibit-regexp
+		   (concat "\\([ \t]*|\\|" auto-fill-inhibit-regexp)
+		 "[ \t]*|"))
+	  (easy-menu-add orgtbl-mode-menu)
+	  (run-hooks 'orgtbl-mode-hook))
       (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp)
       (remove-hook 'before-change-functions 'org-before-change-function t)
       (easy-menu-remove orgtbl-mode-menu)
@@ -7561,70 +7601,70 @@
 
 (defun orgtbl-make-binding (fun n &rest keys)
   "Create a function for binding in the table minor mode.
-FUN is the command to call inside a table.  N is used to create a unique
-command name.  KEYS are keys that should be checked in for a command
+FUN is the command to call inside a table. N is used to create a unique
+command name. KEYS are keys that should be checked in for a command
 to execute outside of tables."
   (eval
    (list 'defun
-         (intern (concat "orgtbl-hijacker-command-" (int-to-string n)))
-         '(arg)
-         (concat "In tables, run `" (symbol-name fun) "'.\n"
-                 "Outside of tables, run the binding of `"
-                 (mapconcat (lambda (x) (format "%s" x)) keys "' or `")
-                 "'.")
-         '(interactive "p")
-         (list 'if
-               '(org-at-table-p)
-               (list 'call-interactively (list 'quote fun))
-               (list 'let '(orgtbl-mode)
-                     (list 'call-interactively
-                           (append '(or)
-                                   (mapcar (lambda (k)
-                                             (list 'key-binding k))
-                                           keys)
-                                   '('orgtbl-error))))))))
+	 (intern (concat "orgtbl-hijacker-command-" (int-to-string n)))
+	 '(arg)
+	 (concat "In tables, run `" (symbol-name fun) "'.\n"
+		 "Outside of tables, run the binding of `"
+		 (mapconcat (lambda (x) (format "%s" x)) keys "' or `")
+		 "'.")
+	 '(interactive "p")
+	 (list 'if
+	       '(org-at-table-p)
+	       (list 'call-interactively (list 'quote fun))
+	       (list 'let '(orgtbl-mode)
+		     (list 'call-interactively
+			   (append '(or)
+				   (mapcar (lambda (k)
+					     (list 'key-binding k))
+					   keys)
+				   '('orgtbl-error))))))))
 
 (defun orgtbl-error ()
   "Error when there is no default binding for a table key."
   (interactive)
-  (error "This key has no function outside tables"))
+  (error "This key is has no function outside tables"))
 
 (defun orgtbl-setup ()
   "Setup orgtbl keymaps."
   (let ((nfunc 0)
-        (bindings
-         (list
-          '([(meta shift left)]  org-table-delete-column)
-          '([(meta left)]        org-table-move-column-left)
-          '([(meta right)]       org-table-move-column-right)
-          '([(meta shift right)] org-table-insert-column)
-          '([(meta shift up)]    org-table-kill-row)
-          '([(meta shift down)]  org-table-insert-row)
-          '([(meta up)]          org-table-move-row-up)
-          '([(meta down)]        org-table-move-row-down)
-          '("\C-c\C-w"           org-table-cut-region)
-          '("\C-c\M-w"           org-table-copy-region)
-          '("\C-c\C-y"           org-table-paste-rectangle)
-          '("\C-c-"              org-table-insert-hline)
-          '([(shift tab)]        org-table-previous-field)
-          '("\C-c\C-c"           org-ctrl-c-ctrl-c)
-          '("\C-m"               org-table-next-row)
-          (list (org-key 'S-return) 'org-table-copy-down)
-          '([(meta return)]      org-table-wrap-region)
-          '("\C-c\C-q"           org-table-wrap-region)
-          '("\C-c?"              org-table-current-column)
-          '("\C-c "              org-table-blank-field)
-          '("\C-c+"              org-table-sum)
-          '("\C-c|"              org-table-toggle-vline-visibility)
-          '("\C-c="              org-table-eval-formula)
-          '("\C-c*"              org-table-recalculate)
-          '([(control ?#)]       org-table-rotate-recalc-marks)))
-        elt key fun cmd)
+	(bindings
+	 (list
+	  '([(meta shift left)]  org-table-delete-column)
+	  '([(meta left)]        org-table-move-column-left)
+	  '([(meta right)]       org-table-move-column-right)
+	  '([(meta shift right)] org-table-insert-column)
+	  '([(meta shift up)]    org-table-kill-row)
+	  '([(meta shift down)]  org-table-insert-row)
+	  '([(meta up)]          org-table-move-row-up)
+	  '([(meta down)]        org-table-move-row-down)
+	  '("\C-c\C-w"           org-table-cut-region)
+	  '("\C-c\M-w"           org-table-copy-region)
+	  '("\C-c\C-y"           org-table-paste-rectangle)
+	  '("\C-c-"              org-table-insert-hline)
+	  '([(shift tab)]        org-table-previous-field)
+	  '("\C-c\C-c"           org-ctrl-c-ctrl-c)
+	  '("\C-m"               org-table-next-row)
+	  (list (org-key 'S-return) 'org-table-copy-down)
+	  '([(meta return)]      org-table-wrap-region)
+	  '("\C-c\C-q"           org-table-wrap-region)
+	  '("\C-c?"              org-table-current-column)
+	  '("\C-c "              org-table-blank-field)
+	  '("\C-c+"              org-table-sum)
+	  '("\C-c|"              org-table-toggle-vline-visibility)
+	  '("\C-c="              org-table-eval-formula)
+	  '("\C-c*"              org-table-recalculate)
+	  '([(control ?#)]       org-table-rotate-recalc-marks)))
+	elt key fun cmd)
     (while (setq elt (pop bindings))
       (setq nfunc (1+ nfunc))
       (setq key (car elt)
-            fun (nth 1 elt)
-            cmd (orgtbl-make-binding fun nfunc key))
+	    fun (nth 1 elt)
+	    cmd (orgtbl-make-binding fun nfunc key))
       (define-key orgtbl-mode-map key cmd))
     ;; Special treatment needed for TAB and RET
     (define-key orgtbl-mode-map [(return)]
@@ -7639,53 +7679,53 @@
       ;; If the user wants maximum table support, we need to hijack
       ;; some standard editing functions
       (substitute-key-definition 'self-insert-command 'orgtbl-self-insert-command
-                                 orgtbl-mode-map global-map)
+				 orgtbl-mode-map global-map)
       (substitute-key-definition 'delete-char 'orgtbl-delete-char
-                                 orgtbl-mode-map global-map)
+				 orgtbl-mode-map global-map)
       (substitute-key-definition 'delete-backward-char 'orgtbl-delete-backward-char
-                                 orgtbl-mode-map global-map)
+				 orgtbl-mode-map global-map)
       (define-key org-mode-map "|" 'self-insert-command))
     (easy-menu-define orgtbl-mode-menu orgtbl-mode-map "OrgTbl menu"
       '("OrgTbl"
-        ["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"]
-        ["Next Field" org-cycle :active (org-at-table-p) :keys "TAB"]
-        ["Previous Field" org-shifttab :active (org-at-table-p) :keys "S-TAB"]
-        ["Next Row" org-return :active (org-at-table-p) :keys "RET"]
-        "--"
-        ["Blank Field" org-table-blank-field :active (org-at-table-p) :keys "C-c SPC"]
-        ["Copy Field from Above"
-         org-table-copy-down :active (org-at-table-p) :keys "S-RET"]
-        "--"
-        ("Column"
-         ["Move Column Left" org-metaleft :active (org-at-table-p) :keys "M-<left>"]
-         ["Move Column Right" org-metaright :active (org-at-table-p) :keys "M-<right>"]
-         ["Delete Column" org-shiftmetaleft :active (org-at-table-p) :keys "M-S-<left>"]
-         ["Insert Column" org-shiftmetaright :active (org-at-table-p) :keys "M-S-<right>"])
-        ("Row"
-         ["Move Row Up" org-metaup :active (org-at-table-p) :keys "M-<up>"]
-         ["Move Row Down" org-metadown :active (org-at-table-p) :keys "M-<down>"]
-         ["Delete Row" org-shiftmetaup :active (org-at-table-p) :keys "M-S-<up>"]
-         ["Insert Row" org-shiftmetadown :active (org-at-table-p) :keys "M-S-<down>"]
-         "--"
-         ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
-        ("Rectangle"
-         ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c M-w"]
-         ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-w"]
-         ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-y"]
-         ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p) :keys "C-c C-q"])
-        "--"
-        ["Eval Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
-        ["Eval Formula Down " (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
-        ["Recalculate line" org-table-recalculate :active (org-at-table-p) :keys "C-c *"]
-        ["Recalculate all" (org-table-recalculate '(4)) :active (org-at-table-p) :keys "C-u C-c *"]
-        ["Toggle Recalculate Mark" org-table-rotate-recalc-marks :active (org-at-table-p) :keys "C-c #"]
-        ["Sum Column/Rectangle" org-table-sum
-         :active (or (org-at-table-p) (org-region-active-p)) :keys "C-c +"]
-        ["Which Column?" org-table-current-column :active (org-at-table-p) :keys "C-c ?"]
-        ["Debug Formulas"
-         (setq org-table-formula-debug (not org-table-formula-debug))
-         :style toggle :selected org-table-formula-debug]
-        ))
+	["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"]
+	["Next Field" org-cycle :active (org-at-table-p) :keys "TAB"]
+	["Previous Field" org-shifttab :active (org-at-table-p) :keys "S-TAB"]
+	["Next Row" org-return :active (org-at-table-p) :keys "RET"]
+	"--"
+	["Blank Field" org-table-blank-field :active (org-at-table-p) :keys "C-c SPC"]
+	["Copy Field from Above"
+	 org-table-copy-down :active (org-at-table-p) :keys "S-RET"]
+	"--"
+	("Column"
+	 ["Move Column Left" org-metaleft :active (org-at-table-p) :keys "M-<left>"]
+	 ["Move Column Right" org-metaright :active (org-at-table-p) :keys "M-<right>"]
+	 ["Delete Column" org-shiftmetaleft :active (org-at-table-p) :keys "M-S-<left>"]
+	 ["Insert Column" org-shiftmetaright :active (org-at-table-p) :keys "M-S-<right>"])
+	("Row"
+	 ["Move Row Up" org-metaup :active (org-at-table-p) :keys "M-<up>"]
+	 ["Move Row Down" org-metadown :active (org-at-table-p) :keys "M-<down>"]
+	 ["Delete Row" org-shiftmetaup :active (org-at-table-p) :keys "M-S-<up>"]
+	 ["Insert Row" org-shiftmetadown :active (org-at-table-p) :keys "M-S-<down>"]
+	 "--"
+	 ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"])
+	("Rectangle"
+	 ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c M-w"]
+	 ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-w"]
+	 ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-y"]
+	 ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p) :keys "C-c C-q"])
+	"--"
+	["Eval Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
+	["Eval Formula Down " (org-table-eval-formula '(4)) :active (org-at-table-p) :keys "C-u C-c ="]
+	["Recalculate line" org-table-recalculate :active (org-at-table-p) :keys "C-c *"]
+	["Recalculate all" (org-table-recalculate '(4)) :active (org-at-table-p) :keys "C-u C-c *"]
+	["Toggle Recalculate Mark" org-table-rotate-recalc-marks :active (org-at-table-p) :keys "C-c #"]
+	["Sum Column/Rectangle" org-table-sum
+	 :active (or (org-at-table-p) (org-region-active-p)) :keys "C-c +"]
+	["Which Column?" org-table-current-column :active (org-at-table-p) :keys "C-c ?"]
+	["Debug Formulas"
+	 (setq org-table-formula-debug (not org-table-formula-debug))
+	 :style toggle :selected org-table-formula-debug]
+	))
     t)
 
 (defun orgtbl-tab ()
@@ -7706,13 +7746,13 @@
 overwritten, and the table is not marked as requiring realignment."
   (interactive "p")
   (if (and (org-at-table-p)
-           (eq N 1)
-           (looking-at "[^|\n]*  +|"))
+	   (eq N 1)
+	   (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
-        (goto-char (1- (match-end 0)))
-        (delete-backward-char 1)
-        (goto-char (match-beginning 0))
-        (self-insert-command N))
+	(goto-char (1- (match-end 0)))
+	(delete-backward-char 1)
+	(goto-char (match-beginning 0))
+	(self-insert-command N))
     (setq org-table-may-need-update t)
     (let (orgtbl-mode)
       (call-interactively (key-binding (vector last-input-event))))))
@@ -7725,14 +7765,14 @@
 reduced column width."
   (interactive "p")
   (if (and (org-at-table-p)
-           (eq N 1)
-           (string-match "|" (buffer-substring (point-at-bol) (point)))
-           (looking-at ".*?|"))
+	   (eq N 1)
+	   (string-match "|" (buffer-substring (point-at-bol) (point)))
+	   (looking-at ".*?|"))
       (let ((pos (point)))
-        (backward-delete-char N)
-        (skip-chars-forward "^|")
-        (insert " ")
-        (goto-char (1- pos)))
+	(backward-delete-char N)
+	(skip-chars-forward "^|")
+	(insert " ")
+	(goto-char (1- pos)))
     (delete-backward-char N)))
 
 (defun orgtbl-delete-char (N)
@@ -7743,15 +7783,15 @@
 a reduced column width."
   (interactive "p")
   (if (and (org-at-table-p)
-           (not (bolp))
-           (not (= (char-after) ?|))
-           (eq N 1))
+	   (not (bolp))
+	   (not (= (char-after) ?|))
+	   (eq N 1))
       (if (looking-at ".*?|")
-          (let ((pos (point)))
-            (replace-match (concat
-                            (substring (match-string 0) 1 -1)
-                            " |"))
-            (goto-char pos)))
+	  (let ((pos (point)))
+	    (replace-match (concat
+			    (substring (match-string 0) 1 -1)
+			    " |"))
+	    (goto-char pos)))
     (delete-char N)))
 
 ;;; Exporting
@@ -7761,29 +7801,29 @@
 (defun org-export-find-first-heading-line (list)
   "Remove all lines from LIST which are before the first headline."
   (let ((orig-list list)
-        (re (concat "^" outline-regexp)))
+	(re (concat "^" outline-regexp)))
     (while (and list
-                (not (string-match re (car list))))
+		(not (string-match re (car list))))
       (pop list))
     (or list orig-list)))
 
 (defun org-skip-comments (lines)
   "Skip lines starting with \"#\" and subtrees starting with COMMENT."
   (let ((re1 (concat "^\\(\\*+\\)[ \t]+" org-comment-string))
-        (re2 "^\\(\\*+\\)[ \t\n\r]")
-        rtn line level)
+	(re2 "^\\(\\*+\\)[ \t\n\r]")
+	rtn line level)
     (while (setq line (pop lines))
       (cond
        ((and (string-match re1 line)
-             (setq level (- (match-end 1) (match-beginning 1))))
-        ;; Beginning of a COMMENT subtree.  Skip it.
-        (while (and (setq line (pop lines))
-                    (or (not (string-match re2 line))
-                        (> (- (match-end 1) (match-beginning 1)) level))))
-        (setq lines (cons line lines)))
+	     (setq level (- (match-end 1) (match-beginning 1))))
+	;; Beginning of a COMMENT subtree.  Skip it.
+	(while (and (setq line (pop lines))
+		    (or (not (string-match re2 line))
+			(> (- (match-end 1) (match-beginning 1)) level))))
+	(setq lines (cons line lines)))
        ((string-match "^#" line)
-        ;; an ordinary comment line
-        )
+	;; an ordinary comment line
+	)
        (t (setq rtn (cons line rtn)))))
     (nreverse rtn)))
 
@@ -8100,29 +8140,29 @@
   (interactive "P")
   (setq-default org-todo-line-regexp org-todo-line-regexp)
   (let* ((region
-          (buffer-substring
-           (if (org-region-active-p) (region-beginning) (point-min))
-           (if (org-region-active-p) (region-end) (point-max))))
-         (lines (org-export-find-first-heading-line
-                 (org-skip-comments (org-split-string region "[\r\n]"))))
-         (org-startup-with-deadline-check nil)
-         (level 0) line txt
-         (umax nil)
-         (case-fold-search nil)
-         (filename (concat (file-name-sans-extension (buffer-file-name))
-                           ".txt"))
-         (buffer (find-file-noselect filename))
-         (levels-open (make-vector org-level-max nil))
+	  (buffer-substring
+	   (if (org-region-active-p) (region-beginning) (point-min))
+	   (if (org-region-active-p) (region-end) (point-max))))
+	 (lines (org-export-find-first-heading-line
+		 (org-skip-comments (org-split-string region "[\r\n]"))))
+	 (org-startup-with-deadline-check nil)
+	 (level 0) line txt
+	 (umax nil)
+	 (case-fold-search nil)
+	 (filename (concat (file-name-sans-extension (buffer-file-name))
+			   ".txt"))
+	 (buffer (find-file-noselect filename))
+	 (levels-open (make-vector org-level-max nil))
 	 (date  (format-time-string "%Y/%m/%d" (current-time)))
 	 (time  (format-time-string "%X" (current-time)))
-         (author      user-full-name)
+	 (author      user-full-name)
 	 (title       (buffer-name))
-         (options     nil)
+	 (options     nil)
 	 (email       user-mail-address)
-         (language    org-export-default-language)
+	 (language    org-export-default-language)
 	 (text        nil)
-         (todo nil)
-         (lang-words nil))
+	 (todo nil)
+	 (lang-words nil))
 
     (setq org-last-level 1)
     (org-init-section-numbers)
@@ -8133,7 +8173,7 @@
     (org-parse-key-lines)
 
     (setq lang-words (or (assoc language org-export-language-setup)
-                         (assoc "en" org-export-language-setup)))
+			 (assoc "en" org-export-language-setup)))
     (if org-export-ascii-show-new-buffer
 	(switch-to-buffer-other-window buffer)
       (set-buffer buffer))
@@ -8141,49 +8181,49 @@
     (fundamental-mode)
     (if options (org-parse-export-options options))
     (setq umax (if arg (prefix-numeric-value arg)
-                 org-export-headline-levels))
+		 org-export-headline-levels))
 
     ;; File header
     (if title (org-insert-centered title ?=))
     (insert "\n")
     (if (or author email)
-        (insert (concat (nth 1 lang-words) ": " (or author "")
-                        (if email (concat " <" email ">") "")
-                        "\n")))
+	(insert (concat (nth 1 lang-words) ": " (or author "")
+			(if email (concat " <" email ">") "")
+			"\n")))
     (if (and date time)
-        (insert (concat (nth 2 lang-words) ": " date " " time "\n")))
+	(insert (concat (nth 2 lang-words) ": " date " " time "\n")))
     (if text (insert (concat (org-html-expand-for-ascii text) "\n\n")))
 
     (insert "\n\n")
 
     (if org-export-with-toc
-        (progn
-          (insert (nth 3 lang-words) "\n"
-                  (make-string (length (nth 3 lang-words)) ?=) "\n")
-          (mapcar '(lambda (line)
+	(progn
+	  (insert (nth 3 lang-words) "\n"
+		  (make-string (length (nth 3 lang-words)) ?=) "\n")
+	  (mapcar '(lambda (line)
 		     (if (string-match org-todo-line-regexp
-                                       line)
+				       line)
 			 ;; This is a headline
 			 (progn
 			   (setq level (- (match-end 1) (match-beginning 1))
 				 txt (match-string 3 line)
-                                 todo
-                                 (or (and (match-beginning 2)
-                                          (not (equal (match-string 2 line)
-                                                      org-done-string)))
-                                        ; TODO, not DONE
-                                     (and (= level umax)
-                                          (org-search-todo-below
-                                           line lines level))))
-                           (setq txt (org-html-expand-for-ascii txt))
-
-                           (if org-export-with-section-numbers
-                               (setq txt (concat (org-section-number level)
-                                                 " " txt)))
+				 todo
+				 (or (and (match-beginning 2)
+					  (not (equal (match-string 2 line)
+						      org-done-string)))
+					; TODO, not DONE
+				     (and (= level umax)
+					  (org-search-todo-below
+					   line lines level))))
+			   (setq txt (org-html-expand-for-ascii txt))
+
+			   (if org-export-with-section-numbers
+			       (setq txt (concat (org-section-number level)
+						 " " txt)))
 			   (if (<= level umax)
 			       (progn
 				 (insert
-                                  (make-string (* (1- level) 4) ?\ )
+				  (make-string (* (1- level) 4) ?\ )
 				  (format (if todo "%s (*)\n" "%s\n") txt))
 				 (setq org-last-level level))
 			     ))))
@@ -8195,10 +8235,10 @@
       (setq line (org-html-expand-for-ascii line))
       (cond
        ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
-        ;; a Headline
-        (setq level (- (match-end 1) (match-beginning 1))
-              txt (match-string 2 line))
-        (org-ascii-level-start level txt umax))
+	;; a Headline
+	(setq level (- (match-end 1) (match-beginning 1))
+	      txt (match-string 2 line))
+	(org-ascii-level-start level txt umax))
        (t (insert line "\n"))))
     (normal-mode)
     (save-buffer)
@@ -8207,19 +8247,19 @@
 (defun org-search-todo-below (line lines level)
   "Search the subtree below LINE for any TODO entries."
   (let ((rest (cdr (memq line lines)))
-        (re org-todo-line-regexp)
-        line lv todo)
+	(re org-todo-line-regexp)
+	line lv todo)
     (catch 'exit
       (while (setq line (pop rest))
-        (if (string-match re line)
-            (progn
-              (setq lv (- (match-end 1) (match-beginning 1))
-                    todo (and (match-beginning 2)
-                              (not (equal (match-string 2 line)
-                                          org-done-string))))
-                                        ; TODO, not DONE
-              (if (<= lv level) (throw 'exit nil))
-              (if todo (throw 'exit t))))))))
+	(if (string-match re line)
+	    (progn
+	      (setq lv (- (match-end 1) (match-beginning 1))
+		    todo (and (match-beginning 2)
+			      (not (equal (match-string 2 line)
+					  org-done-string))))
+					; TODO, not DONE
+	      (if (<= lv level) (throw 'exit nil))
+	      (if todo (throw 'exit t))))))))
 
 ;; FIXME: Try to handle <b> and <i> as faces via text properties.
 ;; FIXME: Can I implement *bold*,/italic/ and _underline_ for ASCII export?
@@ -8227,8 +8267,8 @@
   "Handle quoted HTML for ASCII export."
   (if org-export-html-expand
       (while (string-match "@<[^<>\n]*>" line)
-        ;; We just remove the tags for now.
-        (setq line (replace-match "" nil nil line))))
+	;; We just remove the tags for now.
+	(setq line (replace-match "" nil nil line))))
   line)
 
 (defun org-insert-centered (s &optional underline)
@@ -8236,21 +8276,21 @@
   (let ((ind (max (/ (- 80 (length s)) 2) 0)))
     (insert (make-string ind ?\ ) s "\n")
     (if underline
-        (insert (make-string ind ?\ )
-                (make-string (length s) underline)
-                "\n"))))
+	(insert (make-string ind ?\ )
+		(make-string (length s) underline)
+		"\n"))))
 
 (defun org-ascii-level-start (level title umax)
   "Insert a new level in ASCII export."
   (let (char)
     (if (> level umax)
-        (insert (make-string (* 2 (- level umax 1)) ?\ ) "* " title "\n")
+	(insert (make-string (* 2 (- level umax 1)) ?\ ) "* " title "\n")
       (if (or (not (equal (char-before) ?\n))
-              (not (equal (char-before (1- (point))) ?\n)))
-          (insert "\n"))
+	      (not (equal (char-before (1- (point))) ?\n)))
+	  (insert "\n"))
       (setq char (nth (- umax level) (reverse org-ascii-underline)))
       (if org-export-with-section-numbers
-          (setq title (concat (org-section-number level) " " title)))
+	  (setq title (concat (org-section-number level) " " title)))
       (insert title "\n" (make-string (string-width title) char) "\n"))))
 
 (defun org-export-copy-visible ()
@@ -8259,29 +8299,29 @@
 and all options lines."
   (interactive)
   (let* ((filename (concat (file-name-sans-extension (buffer-file-name))
-                           ".txt"))
-         (buffer (find-file-noselect filename))
-         (ore (concat
-               (org-make-options-regexp
-                '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO"
-                  "STARTUP" "ARCHIVE"
-                  "TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))
-               (if org-noutline-p "\\(\n\\|$\\)" "")))
-         s e)
+			   ".txt"))
+	 (buffer (find-file-noselect filename))
+	 (ore (concat
+	       (org-make-options-regexp
+		'("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO"
+		  "STARTUP" "ARCHIVE"
+		  "TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))
+	       (if org-noutline-p "\\(\n\\|$\\)" "")))
+	 s e)
     (with-current-buffer buffer
       (erase-buffer)
       (text-mode))
     (save-excursion
       (setq s (goto-char (point-min)))
       (while (not (= (point) (point-max)))
-        (goto-char (org-find-invisible))
-        (append-to-buffer buffer s (point))
-        (setq s (goto-char (org-find-visible)))))
+	(goto-char (org-find-invisible))
+	(append-to-buffer buffer s (point))
+	(setq s (goto-char (org-find-visible)))))
     (switch-to-buffer-other-window buffer)
     (newline)
     (goto-char (point-min))
     (if (looking-at ".*-\\*- mode:.*\n")
-        (replace-match ""))
+	(replace-match ""))
     (while (re-search-forward ore nil t)
       (replace-match ""))
     (goto-char (point-min))))
@@ -8289,17 +8329,17 @@
 (defun org-find-visible ()
   (if (featurep 'noutline)
       (let ((s (point)))
-        (while (and (not (= (point-max) (setq s (next-overlay-change s))))
-                    (get-char-property s 'invisible)))
-        s)
+	(while (and (not (= (point-max) (setq s (next-overlay-change s))))
+		    (get-char-property s 'invisible)))
+	s)
     (skip-chars-forward "^\n")
     (point)))
 (defun org-find-invisible ()
   (if (featurep 'noutline)
       (let ((s (point)))
-        (while (and (not (= (point-max) (setq s (next-overlay-change s))))
-                    (not (get-char-property s 'invisible))))
-        s)
+	(while (and (not (= (point-max) (setq s (next-overlay-change s))))
+		    (not (get-char-property s 'invisible))))
+	s)
     (skip-chars-forward "^\r")
     (point)))
 
@@ -8340,7 +8380,7 @@
        (mapconcat 'identity org-todo-keywords " ")
      "Me Jason Marie DONE")
    (cdr (assoc org-startup-folded
-               '((nil . "nofold")(t . "fold")(content . "content"))))
+	       '((nil . "nofold")(t . "fold")(content . "content"))))
    (if org-startup-with-deadline-check "dlcheck" "nodlcheck")
    org-archive-location
    ))
@@ -8351,7 +8391,7 @@
   (if (not (bolp)) (newline))
   (let ((s (org-get-current-options)))
     (and (string-match "#\\+CATEGORY" s)
-         (setq s (substring s 0 (match-beginning 0))))
+	 (setq s (substring s 0 (match-beginning 0))))
     (insert s)))
 
 (defun org-toggle-fixed-width-section (arg)
@@ -8365,29 +8405,29 @@
 If there is a numerical prefix ARG, create ARG new lines starting with \"|\"."
   (interactive "P")
   (let* ((cc 0)
-         (regionp (org-region-active-p))
-         (beg (if regionp (region-beginning) (point)))
-         (end (if regionp (region-end)))
-         (nlines (or arg (if (and beg end) (count-lines beg end) 1)))
-         (re "[ \t]*\\(:\\)")
-         off)
+	 (regionp (org-region-active-p))
+	 (beg (if regionp (region-beginning) (point)))
+	 (end (if regionp (region-end)))
+	 (nlines (or arg (if (and beg end) (count-lines beg end) 1)))
+	 (re "[ \t]*\\(:\\)")
+	 off)
     (save-excursion
       (goto-char beg)
       (setq cc (current-column))
       (beginning-of-line 1)
       (setq off (looking-at re))
       (while (> nlines 0)
-        (setq nlines (1- nlines))
-        (beginning-of-line 1)
-        (cond
-         (arg
-          (move-to-column cc t)
-          (insert ":\n")
-          (forward-line -1))
-         ((and off (looking-at re))
-          (replace-match "" t t nil 1))
-         ((not off) (move-to-column cc t) (insert ":")))
-        (forward-line 1)))))
+	(setq nlines (1- nlines))
+	(beginning-of-line 1)
+	(cond
+	 (arg
+	  (move-to-column cc t)
+	  (insert ":\n")
+	  (forward-line -1))
+	 ((and off (looking-at re))
+	  (replace-match "" t t nil 1))
+	 ((not off) (move-to-column cc t) (insert ":")))
+	(forward-line 1)))))
 
 (defun org-export-as-html-and-open (arg)
   "Export the outline as HTML and immediately open it with a browser.
@@ -8416,32 +8456,32 @@
   (setq-default org-deadline-line-regexp org-deadline-line-regexp)
   (setq-default org-done-string org-done-string)
   (let* ((region-p (org-region-active-p))
-         (region
-          (buffer-substring
-           (if region-p (region-beginning) (point-min))
-           (if region-p (region-end) (point-max))))
-         (all_lines
-          (org-skip-comments (org-split-string region "[\r\n]")))
-         (lines (org-export-find-first-heading-line all_lines))
-         (level 0) (line "") (origline "") txt todo
-         (umax nil)
-         (filename (concat (file-name-sans-extension (buffer-file-name))
-                           ".html"))
-         (buffer (find-file-noselect filename))
-         (levels-open (make-vector org-level-max nil))
+	 (region
+	  (buffer-substring
+	   (if region-p (region-beginning) (point-min))
+	   (if region-p (region-end) (point-max))))
+	 (all_lines
+	  (org-skip-comments (org-split-string region "[\r\n]")))
+	 (lines (org-export-find-first-heading-line all_lines))
+	 (level 0) (line "") (origline "") txt todo
+	 (umax nil)
+	 (filename (concat (file-name-sans-extension (buffer-file-name))
+			   ".html"))
+	 (buffer (find-file-noselect filename))
+	 (levels-open (make-vector org-level-max nil))
 	 (date  (format-time-string "%Y/%m/%d" (current-time)))
 	 (time  (format-time-string "%X" (current-time)))
-         (author      user-full-name)
+	 (author      user-full-name)
 	 (title       (buffer-name))
-         (options     nil)
+	 (options     nil)
 	 (email       user-mail-address)
-         (language    org-export-default-language)
+	 (language    org-export-default-language)
 	 (text        nil)
-         (lang-words  nil)
+	 (lang-words  nil)
 	 (head-count  0) cnt
-         (start       0)
-         table-open type
-         table-buffer table-orig-buffer
+	 (start       0)
+	 table-open type
+	 table-buffer table-orig-buffer
 	 )
     (message "Exporting...")
 
@@ -8451,22 +8491,22 @@
     ;; Search for the export key lines
     (org-parse-key-lines)
     (setq lang-words (or (assoc language org-export-language-setup)
-                         (assoc "en" org-export-language-setup)))
+			 (assoc "en" org-export-language-setup)))
 
     ;; Switch to the output buffer
     (if (or hidden (not org-export-html-show-new-buffer))
-        (set-buffer buffer)
+	(set-buffer buffer)
       (switch-to-buffer-other-window buffer))
     (erase-buffer)
     (fundamental-mode)
     (let ((case-fold-search nil))
       (if options (org-parse-export-options options))
       (setq umax (if arg (prefix-numeric-value arg)
-                   org-export-headline-levels))
+		   org-export-headline-levels))
 
       ;; File header
       (insert (format
-               "<html lang=\"%s\"><head>
+	       "<html lang=\"%s\"><head>
 <title>%s</title>
 <meta http-equiv=\"Content-Type\" content=\"text/html\">
 <meta name=generator content=\"Org-mode\">
@@ -8474,182 +8514,182 @@
 <meta name=author content=\"%s\">
 </head><body>
 "
-         language (org-html-expand title) date time author))
+	 language (org-html-expand title) date time author))
       (if title     (insert (concat "<H1 align=\"center\">"
-                                    (org-html-expand title) "</H1>\n")))
+				    (org-html-expand title) "</H1>\n")))
       (if author    (insert (concat (nth 1 lang-words) ": " author "\n")))
       (if email	  (insert (concat "<a href=\"mailto:" email "\">&lt;"
-                                  email "&gt;</a>\n")))
+				  email "&gt;</a>\n")))
       (if (or author email) (insert "<br>\n"))
       (if (and date time) (insert (concat (nth 2 lang-words) ": "
-                                          date " " time "<br>\n")))
+					  date " " time "<br>\n")))
       (if text      (insert (concat "<p>\n" (org-html-expand text))))
       (if org-export-with-toc
-          (progn
-            (insert (format "<H2>%s</H2>\n" (nth 3 lang-words)))
-            (insert "<ul>\n")
-            (mapcar '(lambda (line)
-                       (if (string-match org-todo-line-regexp line)
-                           ;; This is a headline
-                           (progn
-                             (setq level (- (match-end 1) (match-beginning 1))
-                                   txt (save-match-data
-                                         (org-html-expand
-                                          (match-string 3 line)))
-                                   todo
-                                   (or (and (match-beginning 2)
-                                            (not (equal (match-string 2 line)
-                                                        org-done-string)))
-                                        ; TODO, not DONE
-                                       (and (= level umax)
-                                            (org-search-todo-below
-                                             line lines level))))
-                             (if org-export-with-section-numbers
-                                 (setq txt (concat (org-section-number level)
-                                                   " " txt)))
-                             (if (<= level umax)
-                                 (progn
-                                   (setq head-count (+ head-count 1))
-                                   (if (> level org-last-level)
-                                       (progn
-                                         (setq cnt (- level org-last-level))
-                                         (while (>= (setq cnt (1- cnt)) 0)
-                                           (insert "<ul>"))
-                                         (insert "\n")))
-                                   (if (< level org-last-level)
-                                       (progn
-                                         (setq cnt (- org-last-level level))
-                                         (while (>= (setq cnt (1- cnt)) 0)
-                                           (insert "</ul>"))
-                                         (insert "\n")))
-                                   (insert
-                                    (format
-                                     (if todo
-                                         "<li><a href=\"#sec-%d\"><span style='color:red'>%s</span></a></li>\n"
-                                       "<li><a href=\"#sec-%d\">%s</a></li>\n")
-                                     head-count txt))
-                                   (setq org-last-level level))
-                               ))))
-                    lines)
-            (while (> org-last-level 0)
-              (setq org-last-level (1- org-last-level))
-              (insert "</ul>\n"))
-            ))
+	  (progn
+	    (insert (format "<H2>%s</H2>\n" (nth 3 lang-words)))
+	    (insert "<ul>\n")
+	    (mapcar '(lambda (line)
+		       (if (string-match org-todo-line-regexp line)
+			   ;; This is a headline
+			   (progn
+			     (setq level (- (match-end 1) (match-beginning 1))
+				   txt (save-match-data
+					 (org-html-expand
+					  (match-string 3 line)))
+				   todo
+				   (or (and (match-beginning 2)
+					    (not (equal (match-string 2 line)
+							org-done-string)))
+					; TODO, not DONE
+				       (and (= level umax)
+					    (org-search-todo-below
+					     line lines level))))
+			     (if org-export-with-section-numbers
+				 (setq txt (concat (org-section-number level)
+						   " " txt)))
+			     (if (<= level umax)
+				 (progn
+				   (setq head-count (+ head-count 1))
+				   (if (> level org-last-level)
+				       (progn
+					 (setq cnt (- level org-last-level))
+					 (while (>= (setq cnt (1- cnt)) 0)
+					   (insert "<ul>"))
+					 (insert "\n")))
+				   (if (< level org-last-level)
+				       (progn
+					 (setq cnt (- org-last-level level))
+					 (while (>= (setq cnt (1- cnt)) 0)
+					   (insert "</ul>"))
+					 (insert "\n")))
+				   (insert
+				    (format
+				     (if todo
+					 "<li><a href=\"#sec-%d\"><span style='color:red'>%s</span></a></li>\n"
+				       "<li><a href=\"#sec-%d\">%s</a></li>\n")
+				     head-count txt))
+				   (setq org-last-level level))
+			       ))))
+		    lines)
+	    (while (> org-last-level 0)
+	      (setq org-last-level (1- org-last-level))
+	      (insert "</ul>\n"))
+	    ))
       (setq head-count 0)
       (org-init-section-numbers)
       (while (setq line (pop lines) origline line)
-        ;; Protect the links
-        (setq start 0)
-        (while (string-match org-link-maybe-angles-regexp line start)
-          (setq start (match-end 0))
-          (setq line (replace-match
-                      (concat "\000" (match-string 1 line) "\000")
-                      t t line)))
-
-        ;; replace "<" and ">" by "&lt;" and "&gt;"
-        ;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
-        (setq line (org-html-expand line))
-
-        ;; Verbatim lines
-        (if (and org-export-with-fixed-width
-                 (string-match "^[ \t]*:\\(.*\\)" line))
-            (progn
-              (let ((l (match-string 1 line)))
-                (while (string-match " " l)
-                  (setq l (replace-match "&nbsp;" t t l)))
-                (insert "\n<span style='font-family:Courier'>"
-                        l "</span>"
-                        (if (and lines
-                                 (not (string-match "^[ \t]+\\(:.*\\)"
-                                                    (car lines))))
-                            "<br>\n" "\n"))))
-          (setq start 0)
-          (while (string-match org-protected-link-regexp line start)
-            (setq start (- (match-end 0) 2))
-            (setq type (match-string 1 line))
-            (cond
-             ((member type '("http" "https" "ftp" "mailto" "news"))
-              ;; standard URL
-              (setq line (replace-match
+	;; Protect the links
+	(setq start 0)
+	(while (string-match org-link-maybe-angles-regexp line start)
+	  (setq start (match-end 0))
+	  (setq line (replace-match
+		      (concat "\000" (match-string 1 line) "\000")
+		      t t line)))
+
+	;; replace "<" and ">" by "&lt;" and "&gt;"
+	;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
+	(setq line (org-html-expand line))
+
+	;; Verbatim lines
+	(if (and org-export-with-fixed-width
+		 (string-match "^[ \t]*:\\(.*\\)" line))
+	    (progn
+	      (let ((l (match-string 1 line)))
+		(while (string-match " " l)
+		  (setq l (replace-match "&nbsp;" t t l)))
+		(insert "\n<span style='font-family:Courier'>"
+			l "</span>"
+			(if (and lines
+				 (not (string-match "^[ \t]+\\(:.*\\)"
+						    (car lines))))
+			    "<br>\n" "\n"))))
+	  (setq start 0)
+	  (while (string-match org-protected-link-regexp line start)
+	    (setq start (- (match-end 0) 2))
+	    (setq type (match-string 1 line))
+	    (cond
+	     ((member type '("http" "https" "ftp" "mailto" "news"))
+	      ;; standard URL
+	      (setq line (replace-match
 ;                          "<a href=\"\\1:\\2\">&lt;\\1:\\2&gt;</a>"
-                          "<a href=\"\\1:\\2\">\\1:\\2</a>"
-                          nil nil line)))
-             ((string= type "file")
-              ;; FILE link
+			  "<a href=\"\\1:\\2\">\\1:\\2</a>"
+			  nil nil line)))
+	     ((string= type "file")
+	      ;; FILE link
 	      (let* ((filename (match-string 2 line))
-                     (abs-p (file-name-absolute-p filename))
-                     (thefile (if abs-p (expand-file-name filename) filename))
-                     (thefile (save-match-data
-                                (if (string-match ":[0-9]+$" thefile)
-                                    (replace-match "" t t thefile)
-                                  thefile)))
+		     (abs-p (file-name-absolute-p filename))
+		     (thefile (if abs-p (expand-file-name filename) filename))
+		     (thefile (save-match-data
+				(if (string-match ":[0-9]+$" thefile)
+				    (replace-match "" t t thefile)
+				  thefile)))
 		     (file-is-image-p
 		      (save-match-data
 			(string-match (org-image-file-name-regexp) thefile))))
 		(setq line (replace-match
 			    (if (and org-export-html-inline-images
-                                     file-is-image-p)
-                                (concat "<img src=\"" thefile "\"/>")
+				     file-is-image-p)
+				(concat "<img src=\"" thefile "\"/>")
 			      (concat "<a href=\"" thefile "\">\\1:\\2</a>"))
-                            nil nil line))))
-
-             ((member type '("bbdb" "vm" "wl" "rmail" "gnus" "shell"))
-              (setq line (replace-match
-                          "<i>&lt;\\1:\\2&gt;</i>" nil nil line)))))
-
-          ;; TODO items
-          (if (and (string-match org-todo-line-regexp line)
-                   (match-beginning 2))
-              (if (equal (match-string 2 line) org-done-string)
-                  (setq line (replace-match
-                              "<span style='color:green'>\\2</span>"
-                              nil nil line 2))
-                (setq line (replace-match "<span style='color:red'>\\2</span>"
-                                          nil nil line 2))))
-
-          ;; DEADLINES
-          (if (string-match org-deadline-line-regexp line)
-              (progn
-              (if (save-match-data
-                    (string-match "<a href"
-                                  (substring line 0 (match-beginning 0))))
-                  nil  ; Don't do the replacement - it is inside a link
-                (setq line (replace-match "<span style='color:red'>\\&</span>"
-                                          nil nil line 1)))))
-
-          (cond
-           ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
-            ;; This is a headline
-            (setq level (- (match-end 1) (match-beginning 1))
-                  txt (match-string 2 line))
-            (if (<= level umax) (setq head-count (+ head-count 1)))
-            (org-html-level-start level txt umax
-                                  (and org-export-with-toc (<= level umax))
-                                  head-count))
-
-           ((and org-export-with-tables
-                 (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" line))
-            (if (not table-open)
-                ;; New table starts
-                (setq table-open t table-buffer nil table-orig-buffer nil))
-            ;; Accumulate lines
-            (setq table-buffer (cons line table-buffer)
-                  table-orig-buffer (cons origline table-orig-buffer))
-            (when (or (not lines)
-                      (not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)"
-                                         (car lines))))
-              (setq table-open nil
-                    table-buffer (nreverse table-buffer)
-                    table-orig-buffer (nreverse table-orig-buffer))
-              (insert (org-format-table-html table-buffer table-orig-buffer))))
-           (t
-            ;; Normal lines
-            ;; Lines starting with "-", and empty lines make new paragraph.
-            (if (string-match "^ *-\\|^[ \t]*$" line) (insert "<p>"))
-            (insert line (if org-export-preserve-breaks "<br>\n" "\n"))))
-          ))
+			    nil nil line))))
+
+	     ((member type '("bbdb" "vm" "wl" "rmail" "gnus" "shell"))
+	      (setq line (replace-match
+			  "<i>&lt;\\1:\\2&gt;</i>" nil nil line)))))
+
+	  ;; TODO items
+	  (if (and (string-match org-todo-line-regexp line)
+		   (match-beginning 2))
+	      (if (equal (match-string 2 line) org-done-string)
+		  (setq line (replace-match
+			      "<span style='color:green'>\\2</span>"
+			      nil nil line 2))
+		(setq line (replace-match "<span style='color:red'>\\2</span>"
+					  nil nil line 2))))
+
+	  ;; DEADLINES
+	  (if (string-match org-deadline-line-regexp line)
+	      (progn
+	      (if (save-match-data
+		    (string-match "<a href"
+				  (substring line 0 (match-beginning 0))))
+		  nil  ; Don't do the replacement - it is inside a link
+		(setq line (replace-match "<span style='color:red'>\\&</span>"
+					  nil nil line 1)))))
+
+	  (cond
+	   ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
+	    ;; This is a headline
+	    (setq level (- (match-end 1) (match-beginning 1))
+		  txt (match-string 2 line))
+	    (if (<= level umax) (setq head-count (+ head-count 1)))
+	    (org-html-level-start level txt umax
+				  (and org-export-with-toc (<= level umax))
+				  head-count))
+
+	   ((and org-export-with-tables
+		 (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" line))
+	    (if (not table-open)
+		;; New table starts
+		(setq table-open t table-buffer nil table-orig-buffer nil))
+	    ;; Accumulate lines
+	    (setq table-buffer (cons line table-buffer)
+		  table-orig-buffer (cons origline table-orig-buffer))
+	    (when (or (not lines)
+		      (not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)"
+					 (car lines))))
+	      (setq table-open nil
+		    table-buffer (nreverse table-buffer)
+		    table-orig-buffer (nreverse table-orig-buffer))
+	      (insert (org-format-table-html table-buffer table-orig-buffer))))
+	   (t
+	    ;; Normal lines
+	    ;; Lines starting with "-", and empty lines make new paragraph.
+	    (if (string-match "^ *-\\|^[ \t]*$" line) (insert "<p>"))
+	    (insert line (if org-export-preserve-breaks "<br>\n" "\n"))))
+	  ))
       (if org-export-html-with-timestamp
-          (insert org-export-html-html-helper-timestamp))
+	  (insert org-export-html-html-helper-timestamp))
       (insert "</body>\n</html>\n")
       (normal-mode)
       (save-buffer)
@@ -8662,53 +8702,53 @@
       (org-format-org-table-html lines)
     ;; Table made by table.el - test for spanning
     (let* ((hlines (delq nil (mapcar
-                              (lambda (x)
-                                (if (string-match "^[ \t]*\\+-" x) x
-                                  nil))
-                              lines)))
-           (first (car hlines))
-           (ll (and (string-match "\\S-+" first)
-                    (match-string 0 first)))
-           (re (concat "^[ \t]*" (regexp-quote ll)))
-           (spanning (delq nil (mapcar (lambda (x) (not (string-match re x)))
-                                       hlines))))
+			      (lambda (x)
+				(if (string-match "^[ \t]*\\+-" x) x
+				  nil))
+			      lines)))
+	   (first (car hlines))
+	   (ll (and (string-match "\\S-+" first)
+		    (match-string 0 first)))
+	   (re (concat "^[ \t]*" (regexp-quote ll)))
+	   (spanning (delq nil (mapcar (lambda (x) (not (string-match re x)))
+				       hlines))))
       (if (and (not spanning)
-               (not org-export-prefer-native-exporter-for-tables))
-          ;; We can use my own converter with HTML conversions
-          (org-format-table-table-html lines)
-        ;; Need to use the code generator in table.el, with the original text.
-        (org-format-table-table-html-using-table-generate-source olines)))))
+	       (not org-export-prefer-native-exporter-for-tables))
+	  ;; We can use my own converter with HTML conversions
+	  (org-format-table-table-html lines)
+	;; Need to use the code generator in table.el, with the original text.
+	(org-format-table-table-html-using-table-generate-source olines)))))
 
 (defun org-format-org-table-html (lines)
-  "Format a table into HTML."
+  "Format a table into html."
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
   (setq lines (nreverse lines))
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
   (setq lines (nreverse lines))
   (let ((head (and org-export-highlight-first-table-line
-                   (delq nil (mapcar
-                              (lambda (x) (string-match "^[ \t]*|-" x))
-                              (cdr lines)))))
-        line fields html)
+		   (delq nil (mapcar
+			      (lambda (x) (string-match "^[ \t]*|-" x))
+			      (cdr lines)))))
+	line fields html)
     (setq html (concat org-export-html-table-tag "\n"))
     (while (setq line (pop lines))
       (catch 'next-line
-        (if (string-match "^[ \t]*|-" line)
-            (progn
-              (setq head nil)   ;; head ends here, first time around
-              ;; ignore this line
-              (throw 'next-line t)))
-        ;; Break the line into fields
-        (setq fields (org-split-string line "[ \t]*|[ \t]*"))
-        (setq html (concat
-                    html
-                    "<tr>"
-                    (mapconcat (lambda (x)
-                                 (if head
-                                     (concat "<th>" x "</th>")
-                                   (concat "<td valign=\"top\">" x "</td>")))
-                               fields "")
-                    "</tr>\n"))))
+	(if (string-match "^[ \t]*|-" line)
+	    (progn
+	      (setq head nil)   ;; head ends here, first time around
+	      ;; ignore this line
+	      (throw 'next-line t)))
+	;; Break the line into fields
+	(setq fields (org-split-string line "[ \t]*|[ \t]*"))
+	(setq html (concat
+		    html
+		    "<tr>"
+		    (mapconcat (lambda (x)
+				 (if head
+				     (concat "<th>" x "</th>")
+				   (concat "<td valign=\"top\">" x "</td>")))
+			       fields "")
+		    "</tr>\n"))))
     (setq html (concat html "</table>\n"))
     html))
 
@@ -8723,51 +8763,51 @@
     newstr))
 
 (defun org-format-table-table-html (lines)
-  "Format a table generated by table.el into HTML.
+  "Format a table generated by table.el into html.
 This conversion does *not* use `table-generate-source' from table.el.
 This has the advantage that Org-mode's HTML conversions can be used.
 But it has the disadvantage, that no cell- or row-spanning is allowed."
   (let (line field-buffer
-             (head org-export-highlight-first-table-line)
-             fields html empty)
+	     (head org-export-highlight-first-table-line)
+	     fields html empty)
     (setq html (concat org-export-html-table-tag "\n"))
     (while (setq line (pop lines))
       (setq empty "&nbsp")
       (catch 'next-line
-        (if (string-match "^[ \t]*\\+-" line)
-            (progn
-              (if field-buffer
-                  (progn
-                    (setq html (concat
-                                html
-                                "<tr>"
-                                (mapconcat
-                                 (lambda (x)
-                                   (if (equal x "") (setq x empty))
-                                   (if head
-                                       (concat "<th valign=\"top\">" x
-                                               "</th>\n")
-                                     (concat "<td valign=\"top\">" x
-                                             "</td>\n")))
-                                 field-buffer "\n")
-                                "</tr>\n"))
-                    (setq head nil)
-                    (setq field-buffer nil)))
-              ;; Ignore this line
-              (throw 'next-line t)))
-        ;; Break the line into fields and store the fields
-        (setq fields (org-split-string line "[ \t]*|[ \t]*"))
-        (if field-buffer
-            (setq field-buffer (mapcar
-                                (lambda (x)
-                                  (concat x "<br>" (pop fields)))
-                                field-buffer))
-          (setq field-buffer fields))))
+	(if (string-match "^[ \t]*\\+-" line)
+	    (progn
+	      (if field-buffer
+		  (progn
+		    (setq html (concat
+				html
+				"<tr>"
+				(mapconcat
+				 (lambda (x)
+				   (if (equal x "") (setq x empty))
+				   (if head
+				       (concat "<th valign=\"top\">" x
+					       "</th>\n")
+				     (concat "<td valign=\"top\">" x
+					     "</td>\n")))
+				 field-buffer "\n")
+				"</tr>\n"))
+		    (setq head nil)
+		    (setq field-buffer nil)))
+	      ;; Ignore this line
+	      (throw 'next-line t)))
+	;; Break the line into fields and store the fields
+	(setq fields (org-split-string line "[ \t]*|[ \t]*"))
+	(if field-buffer
+	    (setq field-buffer (mapcar
+				(lambda (x)
+				  (concat x "<br>" (pop fields)))
+				field-buffer))
+	  (setq field-buffer fields))))
     (setq html (concat html "</table>\n"))
     html))
 
 (defun org-format-table-table-html-using-table-generate-source (lines)
-  "Format a table into HTML, using `table-generate-source' from table.el.
+  "Format a table into html, using `table-generate-source' from table.el.
 This has the advantage that cell- or row-spanning is allowed.
 But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
   (require 'table)
@@ -8776,7 +8816,7 @@
     (insert (mapconcat 'identity lines "\n"))
     (goto-char (point-min))
     (if (not (re-search-forward "|[^+]" nil t))
-        (error "Error processing table"))
+	(error "Error processing table"))
     (table-recognize-table)
     (with-current-buffer (get-buffer-create " org-tmp2 ") (erase-buffer))
     (table-generate-source 'html " org-tmp2 ")
@@ -8788,29 +8828,29 @@
   ;; First check if there is a link in the line - if yes, apply conversions
   ;; only before the start of the link.
   (let* ((m (string-match org-link-regexp string))
-         (s (if m (substring string 0 m) string))
-         (r (if m (substring string m) "")))
+	 (s (if m (substring string 0 m) string))
+	 (r (if m (substring string m) "")))
     ;; convert < to &lt; and > to &gt;
     (while (string-match "<" s)
       (setq s (replace-match "&lt;" t t s)))
     (while (string-match ">" s)
       (setq s (replace-match "&gt;" t t s)))
     (if org-export-html-expand
-        (while (string-match "@&lt;\\([^&]*\\)&gt;" s)
-          (setq s (replace-match "<\\1>" nil nil s))))
+	(while (string-match "@&lt;\\([^&]*\\)&gt;" s)
+	  (setq s (replace-match "<\\1>" nil nil s))))
     (if org-export-with-emphasize
-        (setq s (org-export-html-convert-emphasize s)))
+	(setq s (org-export-html-convert-emphasize s)))
     (if org-export-with-sub-superscripts
-        (setq s (org-export-html-convert-sub-super s)))
+	(setq s (org-export-html-convert-sub-super s)))
     (if org-export-with-TeX-macros
-        (let ((start 0) wd ass)
-          (while (setq start (string-match "\\\\\\([a-zA-Z]+\\)" s start))
-            (setq wd (match-string 1 s))
-            (if (setq ass (assoc wd org-html-entities))
-                (setq s (replace-match (or (cdr ass)
-                                           (concat "&" (car ass) ";"))
-                                       t t s))
-              (setq start (+ start (length wd)))))))
+	(let ((start 0) wd ass)
+	  (while (setq start (string-match "\\\\\\([a-zA-Z]+\\)" s start))
+	    (setq wd (match-string 1 s))
+	    (if (setq ass (assoc wd org-html-entities))
+		(setq s (replace-match (or (cdr ass)
+					   (concat "&" (car ass) ";"))
+				       t t s))
+	      (setq start (+ start (length wd)))))))
     (concat s r)))
 
 (defun org-create-multibrace-regexp (left right n)
@@ -8822,13 +8862,13 @@
 match except for the outermost delimiters.  The maximum depth of
 stacked delimiters is N.  Escaping delimiters is not possible."
   (let* ((nothing (concat "[^" "\\" left "\\" right "]*?"))
-         (or "\\|")
-         (re nothing)
-         (next (concat "\\(?:" nothing left nothing right "\\)+" nothing)))
+	 (or "\\|")
+	 (re nothing)
+	 (next (concat "\\(?:" nothing left nothing right "\\)+" nothing)))
     (while (> n 1)
       (setq n (1- n)
-            re (concat re or next)
-            next (concat "\\(?:" nothing left next right "\\)+" nothing)))
+	    re (concat re or next)
+	    next (concat "\\(?:" nothing left next right "\\)+" nothing)))
     (concat left "\\(" re "\\)" right)))
 
 (defvar org-match-substring-regexp
@@ -8847,35 +8887,35 @@
     (while (string-match org-match-substring-regexp string)
       (setq key (if (string= (match-string 2 string) "_") "sub" "sup"))
       (setq c (or (match-string 8 string)
-                  (match-string 6 string)
-                  (match-string 5 string)))
+		  (match-string 6 string)
+		  (match-string 5 string)))
       (setq string (replace-match
-                    (concat (match-string 1 string)
-                            "<" key ">" c "</" key ">")
-                    t t string)))
+		    (concat (match-string 1 string)
+			    "<" key ">" c "</" key ">")
+		    t t string)))
     (while (string-match "\\\\\\([_^]\\)" string)
       (setq string (replace-match (match-string 1 string) t t string))))
   string)
 
 (defun org-export-html-convert-emphasize (string)
   (while (string-match
-          "\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
-          string)
+	  "\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
+	  string)
     (setq string (replace-match
-                  (concat "<b>" (match-string 3 string) "</b>")
-                  t t string 2)))
+		  (concat "<b>" (match-string 3 string) "</b>")
+		  t t string 2)))
   (while (string-match
-          "\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
-          string)
+	  "\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
+	  string)
     (setq string (replace-match
-                  (concat "<i>" (match-string 3 string) "</i>")
-                  t t string 2)))
+		  (concat "<i>" (match-string 3 string) "</i>")
+		  t t string 2)))
   (while (string-match
-          "\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
-          string)
+	  "\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
+	  string)
     (setq string (replace-match
-                  (concat "<u>" (match-string 3 string) "</u>")
-                  t t string 2)))
+		  (concat "<u>" (match-string 3 string) "</u>")
+		  t t string 2)))
   string)
 
 (defun org-parse-key-lines ()
@@ -8883,59 +8923,59 @@
   (save-excursion
     (goto-char 0)
     (let ((re (org-make-options-regexp
-               '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")))
-          key)
+	       '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")))
+	  key)
       (while (re-search-forward re nil t)
-        (setq key (match-string 1))
-        (cond ((string-equal key "TITLE")
-               (setq title (match-string 2)))
-              ((string-equal key "AUTHOR")
-               (setq author (match-string 2)))
-              ((string-equal key "EMAIL")
-               (setq email (match-string 2)))
-              ((string-equal key "LANGUAGE")
-               (setq language (match-string 2)))
-              ((string-equal key "TEXT")
-               (setq text (concat text "\n" (match-string 2))))
-              ((string-equal key "OPTIONS")
-               (setq options (match-string 2))))))))
+	(setq key (match-string 1))
+	(cond ((string-equal key "TITLE")
+	       (setq title (match-string 2)))
+	      ((string-equal key "AUTHOR")
+	       (setq author (match-string 2)))
+	      ((string-equal key "EMAIL")
+	       (setq email (match-string 2)))
+	      ((string-equal key "LANGUAGE")
+	       (setq language (match-string 2)))
+	      ((string-equal key "TEXT")
+	       (setq text (concat text "\n" (match-string 2))))
+	      ((string-equal key "OPTIONS")
+	       (setq options (match-string 2))))))))
 
 (defun org-parse-export-options (s)
   "Parse the export options line."
   (let ((op '(("H"     . org-export-headline-levels)
-              ("num"   . org-export-with-section-numbers)
-              ("toc"   . org-export-with-toc)
-              ("\\n"   . org-export-preserve-breaks)
-              ("@"     . org-export-html-expand)
-              (":"     . org-export-with-fixed-width)
-              ("|"     . org-export-with-tables)
-              ("^"     . org-export-with-sub-superscripts)
-              ("*"     . org-export-with-emphasize)
-              ("TeX"   . org-export-with-TeX-macros)))
-        o)
+	      ("num"   . org-export-with-section-numbers)
+	      ("toc"   . org-export-with-toc)
+	      ("\\n"   . org-export-preserve-breaks)
+	      ("@"     . org-export-html-expand)
+	      (":"     . org-export-with-fixed-width)
+	      ("|"     . org-export-with-tables)
+	      ("^"     . org-export-with-sub-superscripts)
+	      ("*"     . org-export-with-emphasize)
+	      ("TeX"   . org-export-with-TeX-macros)))
+	o)
     (while (setq o (pop op))
       (if (string-match (concat (regexp-quote (car o)) ":\\([^ \t\n\r;,.]*\\)")
-                        s)
-          (set (make-local-variable (cdr o))
-               (car (read-from-string (match-string 1 s))))))))
+			s)
+	  (set (make-local-variable (cdr o))
+	       (car (read-from-string (match-string 1 s))))))))
 
 (defun org-html-level-start (level title umax with-toc head-count)
   "Insert a new level in HTML export."
   (let ((l (1+ (max level umax))))
     (while (<= l org-level-max)
       (if (aref levels-open (1- l))
-          (progn
-            (org-html-level-close l)
-            (aset levels-open (1- l) nil)))
+	  (progn
+	    (org-html-level-close l)
+	    (aset levels-open (1- l) nil)))
       (setq l (1+ l)))
     (if (> level umax)
-        (progn
-          (if (aref levels-open (1- level))
-              (insert "<li>" title "<p>\n")
-            (aset levels-open (1- level) t)
-            (insert "<ul><li>" title "<p>\n")))
+	(progn
+	  (if (aref levels-open (1- level))
+	      (insert "<li>" title "<p>\n")
+	    (aset levels-open (1- level) t)
+	    (insert "<ul><li>" title "<p>\n")))
       (if org-export-with-section-numbers
-          (setq title (concat (org-section-number level) " " title)))
+	  (setq title (concat (org-section-number level) " " title)))
       (setq level (+ level 1))
       (if with-toc
 	  (insert (format "\n<H%d><a name=\"sec-%d\">%s</a></H%d>\n"
@@ -8953,18 +8993,18 @@
 (defun org-init-section-numbers ()
   "Initialize the vector for the section numbers."
   (let* ((level  -1)
-         (numbers (nreverse (org-split-string "" "\\.")))
-         (depth (1- (length org-section-numbers)))
-         (i depth) number-string)
+	 (numbers (nreverse (org-split-string "" "\\.")))
+	 (depth (1- (length org-section-numbers)))
+	 (i depth) number-string)
     (while (>= i 0)
       (if (> i level)
-          (aset org-section-numbers i 0)
-        (setq number-string (or (car numbers) "0"))
-        (if (string-match "\\`[A-Z]\\'" number-string)
-            (aset org-section-numbers i
-                  (- (string-to-char number-string) ?A -1))
-            (aset org-section-numbers i (string-to-int number-string)))
-        (pop numbers))
+	  (aset org-section-numbers i 0)
+	(setq number-string (or (car numbers) "0"))
+	(if (string-match "\\`[A-Z]\\'" number-string)
+	    (aset org-section-numbers i
+		  (- (string-to-char number-string) ?A -1))
+	    (aset org-section-numbers i (string-to-int number-string)))
+	(pop numbers))
       (setq i (1- i)))))
 
 (defun org-section-number (&optional level)
@@ -8973,24 +9013,24 @@
   (let* ((depth (1- (length org-section-numbers))) idx n (string ""))
     (when level
       (when (> level -1)
-        (aset org-section-numbers
-              level (1+ (aref org-section-numbers level))))
+	(aset org-section-numbers
+	      level (1+ (aref org-section-numbers level))))
       (setq idx (1+ level))
       (while (<= idx depth)
-        (if (not (= idx 1))
-            (aset org-section-numbers idx 0))
-        (setq idx (1+ idx))))
+	(if (not (= idx 1))
+	    (aset org-section-numbers idx 0))
+	(setq idx (1+ idx))))
     (setq idx 0)
     (while (<= idx depth)
       (setq n (aref org-section-numbers idx))
       (setq string (concat string (if (not (string= string "")) "." "")
-                           (int-to-string n)))
+			   (int-to-string n)))
       (setq idx (1+ idx)))
     (save-match-data
       (if (string-match "\\`\\([@0]\\.\\)+" string)
-          (setq string (replace-match "" nil nil string)))
+	  (setq string (replace-match "" nil nil string)))
       (if (string-match "\\(\\.0\\)+\\'" string)
-          (setq string (replace-match "" nil nil string))))
+	  (setq string (replace-match "" nil nil string))))
     string))
 
 
@@ -9048,7 +9088,7 @@
 (define-key org-mode-map (org-key 'S-left)  'org-timestamp-down-day)
 (define-key org-mode-map (org-key 'S-right) 'org-timestamp-up-day)
 (define-key org-mode-map "\C-c-"          'org-table-insert-hline)
-;; The following line is e.g. necessary for German keyboards under Suse Linux
+;; The following line is necessary for German keyboards under Suse GNU/Linux
 (unless org-xemacs-p
   (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
 (define-key org-mode-map [(shift tab)]    'org-shifttab)
@@ -9084,13 +9124,13 @@
 overwritten, and the table is not marked as requiring realignment."
   (interactive "p")
   (if (and (org-table-p)
-           (eq N 1)
-           (looking-at "[^|\n]*  +|"))
+	   (eq N 1)
+	   (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
-        (goto-char (1- (match-end 0)))
-        (delete-backward-char 1)
-        (goto-char (match-beginning 0))
-        (self-insert-command N))
+	(goto-char (1- (match-end 0)))
+	(delete-backward-char 1)
+	(goto-char (match-beginning 0))
+	(self-insert-command N))
     (setq org-table-may-need-update t)
     (self-insert-command N)))
 
@@ -9106,14 +9146,14 @@
 reduced column width."
   (interactive "p")
   (if (and (org-table-p)
-           (eq N 1)
-           (string-match "|" (buffer-substring (point-at-bol) (point)))
-           (looking-at ".*?|"))
+	   (eq N 1)
+	   (string-match "|" (buffer-substring (point-at-bol) (point)))
+	   (looking-at ".*?|"))
       (let ((pos (point)))
-        (backward-delete-char N)
-        (skip-chars-forward "^|")
-        (insert " ")
-        (goto-char (1- pos)))
+	(backward-delete-char N)
+	(skip-chars-forward "^|")
+	(insert " ")
+	(goto-char (1- pos)))
     (backward-delete-char N)))
 
 (defun org-delete-char (N)
@@ -9124,15 +9164,15 @@
 a reduced column width."
   (interactive "p")
   (if (and (org-table-p)
-           (not (bolp))
-           (not (= (char-after) ?|))
-           (eq N 1))
+	   (not (bolp))
+	   (not (= (char-after) ?|))
+	   (eq N 1))
       (if (looking-at ".*?|")
-          (let ((pos (point)))
-            (replace-match (concat
-                            (substring (match-string 0) 1 -1)
-                            " |"))
-            (goto-char pos)))
+	  (let ((pos (point)))
+	    (replace-match (concat
+			    (substring (match-string 0) 1 -1)
+			    " |"))
+	    (goto-char pos)))
     (delete-char N)))
 
 ;; How to do this: Measure non-white length of current string
@@ -9142,11 +9182,11 @@
   ;; If the user wants maximum table support, we need to hijack
   ;; some standard editing functions
   (substitute-key-definition 'self-insert-command 'org-self-insert-command
-                             org-mode-map global-map)
+			     org-mode-map global-map)
   (substitute-key-definition 'delete-char 'org-delete-char
-                             org-mode-map global-map)
+			     org-mode-map global-map)
   (substitute-key-definition 'delete-backward-char 'org-delete-backward-char
-                             org-mode-map global-map)
+			     org-mode-map global-map)
   (define-key org-mode-map "|" 'self-insert-command))
 
 (defun org-shiftcursor-error ()
@@ -9275,25 +9315,25 @@
      ((org-at-table-p)
       (org-table-maybe-eval-formula)
       (if arg
-          (org-table-recalculate t)
-        (org-table-maybe-recalculate-line))
+	  (org-table-recalculate t)
+	(org-table-maybe-recalculate-line))
       (org-table-align))
      ((save-excursion (beginning-of-line 1) (looking-at "#\\+\\([A-Z]+\\)"))
       (cond
        ((equal (match-string 1) "TBLFM")
-        ;; Recalculate the table before this line
-        (save-excursion
-          (beginning-of-line 1)
-          (skip-chars-backward " \r\n\t")
-          (if (org-at-table-p) (org-table-recalculate t))))
+	;; Recalculate the table before this line
+	(save-excursion
+	  (beginning-of-line 1)
+	  (skip-chars-backward " \r\n\t")
+	  (if (org-at-table-p) (org-table-recalculate t))))
        (t
-        (let ((org-inhibit-startup t)) (org-mode)))))
+	(let ((org-inhibit-startup t)) (org-mode)))))
      ((org-region-active-p)
       (org-table-convert-region (region-beginning) (region-end) arg))
      ((and (region-beginning) (region-end))
       (if (y-or-n-p "Convert inactive region to table? ")
-          (org-table-convert-region (region-beginning) (region-end) arg)
-        (error "Abort")))
+	  (org-table-convert-region (region-beginning) (region-end) arg)
+	(error "Abort")))
      (t (error "No table at point, and no region to make one")))))
 
 (defun org-return ()
@@ -9361,7 +9401,7 @@
      :style toggle :selected (org-in-invisibility-spec-p '(org-table))]
     "--"
     ["Create" org-table-create (and (not (org-at-table-p))
-                                    org-enable-table-editor)]
+				    org-enable-table-editor)]
     ["Convert Region" org-ctrl-c-ctrl-c (not (org-at-table-p 'any))]
     ["Import from File" org-table-import (not (org-at-table-p))]
     ["Export to File" org-table-export (org-at-table-p)]
@@ -9473,7 +9513,7 @@
 ;;; Documentation
 
 (defun org-customize ()
-  "Call the customize function with `org' as argument."
+  "Call the customize function with org as argument."
   (interactive)
   (customize-browse 'org))
 
@@ -9531,7 +9571,7 @@
   (if org-ignore-region
       nil
     (if org-xemacs-p
-        (and zmacs-regions (region-active-p))
+	(and zmacs-regions (region-active-p))
       (and transient-mark-mode mark-active))))
 
 (defun org-add-to-invisibility-spec (arg)
@@ -9552,8 +9592,8 @@
   (if (fboundp 'remove-from-invisibility-spec)
       (remove-from-invisibility-spec arg)
     (if (consp buffer-invisibility-spec)
-        (setq buffer-invisibility-spec
-              (delete arg buffer-invisibility-spec)))))
+	(setq buffer-invisibility-spec
+	      (delete arg buffer-invisibility-spec)))))
 
 (defun org-in-invisibility-spec-p (arg)
   "Is ARG a member of `buffer-invisibility-spec'?."
@@ -9566,14 +9606,14 @@
   (if (fboundp 'image-file-name-regexp)
       (image-file-name-regexp)
     (let ((image-file-name-extensions
-           '("png" "jpeg" "jpg" "gif" "tiff" "tif"
-             "xbm" "xpm" "pbm" "pgm" "ppm")))
+	   '("png" "jpeg" "jpg" "gif" "tiff" "tif"
+	     "xbm" "xpm" "pbm" "pgm" "ppm")))
       (concat "\\."
-              (regexp-opt (nconc (mapcar 'upcase
-                                         image-file-name-extensions)
-                                 image-file-name-extensions)
-                          t)
-              "\\'"))))
+	      (regexp-opt (nconc (mapcar 'upcase
+					 image-file-name-extensions)
+				 image-file-name-extensions)
+			  t)
+	      "\\'"))))
 
 ;; Functions needed for compatibility with old outline.el
 
@@ -9593,9 +9633,9 @@
       nil
     (backward-char 1)
     (if (org-invisible-p)
-        (while (and (not (bobp)) (org-invisible-p))
-          (backward-char 1)
-          (beginning-of-line 1))
+	(while (and (not (bobp)) (org-invisible-p))
+	  (backward-char 1)
+	  (beginning-of-line 1))
       (forward-char 1))))
 (when org-noutline-p
   (define-key org-mode-map "\C-a" 'org-beginning-of-line))
@@ -9605,26 +9645,26 @@
   (if org-noutline-p
       ;; Early versions of noutline don't have `outline-invisible-p'.
       (if (fboundp 'outline-invisible-p)
-          (outline-invisible-p)
-        (get-char-property (point) 'invisible))
+	  (outline-invisible-p)
+	(get-char-property (point) 'invisible))
     (save-excursion
       (skip-chars-backward "^\r\n")
       (equal (char-before) ?\r))))
 
 (defun org-back-to-heading (&optional invisible-ok)
-  "Move to previous heading line, or beginning of this line if it's a heading.
+  "Move to previous heading line, or beg of this line if it's a heading.
 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
   (if org-noutline-p
       (outline-back-to-heading invisible-ok)
     (if (looking-at outline-regexp)
-        t
+	t
       (if (re-search-backward (concat (if invisible-ok "\\([\r\n]\\|^\\)" "^")
-                                      outline-regexp)
-                              nil t)
-          (if invisible-ok
-              (progn (goto-char (match-end 1))
-                     (looking-at outline-regexp)))
-        (error "Before first heading")))))
+				      outline-regexp)
+			      nil t)
+	  (if invisible-ok
+	      (progn (goto-char (match-end 1))
+		     (looking-at outline-regexp)))
+	(error "Before first heading")))))
 
 (defun org-on-heading-p (&optional invisible-ok)
   "Return t if point is on a (visible) heading line.
@@ -9634,9 +9674,9 @@
     (save-excursion
       (skip-chars-backward "^\n\r")
       (and (looking-at outline-regexp)
-           (or invisible-ok
-               (bobp)
-               (equal (char-before) ?\n))))))
+	   (or invisible-ok
+	       (bobp)
+	       (equal (char-before) ?\n))))))
 
 (defun org-up-heading-all (arg)
   "Move to the heading line of which the present line is a subheading.
@@ -9644,26 +9684,26 @@
 With argument, move up ARG levels."
   (if org-noutline-p
       (if (fboundp 'outline-up-heading-all)
-          (outline-up-heading-all arg)   ; emacs 21 version of outline.el
-        (outline-up-heading arg t))      ; emacs 22 version of outline.el
+	  (outline-up-heading-all arg)   ; emacs 21 version of outline.el
+	(outline-up-heading arg t))      ; emacs 22 version of outline.el
     (org-back-to-heading t)
     (looking-at outline-regexp)
     (if (<= (- (match-end 0) (match-beginning 0)) arg)
-        (error "Cannot move up %d levels" arg)
+	(error "Cannot move up %d levels" arg)
     (re-search-backward
      (concat "[\n\r]" (regexp-quote
-                       (make-string (- (match-end 0) (match-beginning 0) arg)
-                                    ?*))
-             "[^*]"))
+		       (make-string (- (match-end 0) (match-beginning 0) arg)
+				    ?*))
+	     "[^*]"))
     (forward-char 1))))
 
 (defun org-show-hidden-entry ()
   "Show an entry where even the heading is hidden."
   (save-excursion
     (if (not org-noutline-p)
-        (progn
-          (org-back-to-heading t)
-          (org-flag-heading nil)))
+	(progn
+	  (org-back-to-heading t)
+	  (org-flag-heading nil)))
     (org-show-entry)))
 
 (defun org-check-occur-regexp (regexp)
@@ -9672,7 +9712,7 @@
   (if org-noutline-p
       regexp
     (if (string-match "^\\^" regexp)
-        (concat "[\n\r]" (substring regexp 1))
+	(concat "[\n\r]" (substring regexp 1))
       regexp)))
 
 (defun org-flag-heading (flag &optional entry)
@@ -9681,21 +9721,21 @@
   (save-excursion
     (org-back-to-heading t)
     (if (not org-noutline-p)
-        ;; Make the current headline visible
-        (outline-flag-region (max 1 (1- (point))) (point) (if flag ?\r ?\n)))
+	;; Make the current headline visible
+	(outline-flag-region (max 1 (1- (point))) (point) (if flag ?\r ?\n)))
     ;; Check if we should show the entire entry
     (if entry
-        (progn
-          (org-show-entry)
-          (save-excursion  ;; FIXME: Is this the fix for points in the   -|
-                           ;;        middle of text?                      |
-            (and (outline-next-heading)   ;;                              |
-                 (org-flag-heading nil))))  ; show the next heading      _|
+	(progn
+	  (org-show-entry)
+	  (save-excursion  ;; FIXME: Is this the fix for points in the   -|
+			   ;;        middle of text?                      |
+	    (and (outline-next-heading)   ;;                              |
+		 (org-flag-heading nil))))  ; show the next heading      _|
       (outline-flag-region (max 1 (1- (point)))
-                           (save-excursion (outline-end-of-heading) (point))
-                           (if org-noutline-p
-                               flag
-                             (if flag ?\r ?\n))))))
+			   (save-excursion (outline-end-of-heading) (point))
+			   (if org-noutline-p
+			       flag
+			     (if flag ?\r ?\n))))))
 
 (defun org-show-subtree ()
   "Show everything after this heading at deeper levels."
@@ -9734,8 +9774,8 @@
   '(defadvice bookmark-jump (after org-make-visible activate)
      "Make the position visible."
      (and (eq major-mode 'org-mode)
-          (org-invisible-p)
-          (org-show-hierarchy-above))))
+	  (org-invisible-p)
+	  (org-show-hierarchy-above))))
 
 ;;; Finish up
 
--- a/lisp/textmodes/page-ext.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/page-ext.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
@@ -120,8 +120,8 @@
 ;;
 ;;     FSF
 ;;     Free Software Foundation
-;;     59 Temple Place - Suite 330
-;;     Boston, MA 02111-1307  USA.
+;;     51 Franklin Street, Fifth Floor
+;;     Boston, MA 02110-1301  USA.
 ;;     (617) 542-5942
 ;;     gnu@gnu.org
 ;;
--- a/lisp/textmodes/page.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/page.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/paragraphs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/paragraphs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/picture.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/picture.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/po.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/po.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/refbib.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/refbib.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/refer.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/refer.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/refill.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/refill.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-auc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-auc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-cite.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-cite.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-dcr.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-dcr.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-global.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-global.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-index.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-index.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-parse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-parse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-ref.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-ref.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-sel.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-sel.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-toc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-toc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/reftex.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/reftex.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;---------------------------------------------------------------------------
 ;;
--- a/lisp/textmodes/sgml-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/sgml-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/spell.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/spell.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/table.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/table.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/tex-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/tex-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/texinfmt.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/texinfmt.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/texinfo.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/texinfo.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Todo:
 
--- a/lisp/textmodes/texnfo-upd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/texnfo-upd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/text-mode.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/text-mode.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/tildify.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/tildify.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/two-column.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/two-column.el	Tue Jul 05 22:22:24 2005 +0000
@@ -33,8 +33,8 @@
 ;; GNU Emacs; vidu la dosieron COPYING.	 with GNU Emacs; see the file
 ;; Alikaze skribu al la			 COPYING.  If not, write to the
 
-;; Free Software Foundation, 59 Temple Place - Suite 330
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, 51 Franklin Street, Fifth Floor
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
--- a/lisp/textmodes/underline.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/textmodes/underline.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/thumbs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/thumbs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 ;;
 ;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
 ;;         The peoples at #emacs@freenode.net for numerous help
--- a/lisp/time-stamp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/time-stamp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/time.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/time.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/timezone.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/timezone.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/tmm.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tmm.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/toolbar/tool-bar.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/toolbar/tool-bar.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/tooltip.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tooltip.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/tree-widget.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/tree-widget.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,8 @@
 
 ;; 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.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
@@ -31,75 +31,70 @@
 ;;
 ;; The following properties are specific to the tree widget:
 ;;
-;;   :open
-;;      Set to non-nil to unfold the tree.  By default the tree is
-;;      folded.
+;; :open
+;;    Set to non-nil to expand the tree.  By default the tree is
+;;    collapsed.
 ;;
-;;   :node
-;;      Specify the widget used to represent a tree node.  By default
-;;      this is an `item' widget which displays the tree-widget :tag
-;;      property value if defined or a string representation of the
-;;      tree-widget value.
-;;
-;;   :keep
-;;      Specify a list of properties to keep when the tree is
-;;      folded so they can be recovered when the tree is unfolded.
-;;      This property can be used in child widgets too.
+;; :node
+;;    Specify the widget used to represent the value of a tree node.
+;;    By default this is an `item' widget which displays the
+;;    tree-widget :tag property value if defined, or a string
+;;    representation of the tree-widget value.
 ;;
-;;   :dynargs
-;;      Specify a function to be called when the tree is unfolded, to
-;;      dynamically provide the tree children in response to an unfold
-;;      request.  This function will be passed the tree widget and
-;;      must return a list of child widgets.  That list will be stored
-;;      as the :args property of the parent tree.
-
-;;      To speed up successive unfold requests, the :dynargs function
-;;      can directly return the :args value if non-nil.  Refreshing
-;;      child values can be achieved by giving the :args property the
-;;      value nil, then redrawing the tree.
+;; :keep
+;;    Specify a list of properties to keep when the tree is collapsed
+;;    so they can be recovered when the tree is expanded.  This
+;;    property can be used in child widgets too.
 ;;
-;;   :has-children
-;;      Specify if this tree has children.  This property has meaning
-;;      only when used with the above :dynargs one.  It indicates that
-;;      child widgets exist but will be dynamically provided when
-;;      unfolding the node.
+;; :expander (obsoletes :dynargs)
+;;    Specify a function to be called to dynamically provide the
+;;    tree's children in response to an expand request.  This function
+;;    will be passed the tree widget and must return a list of child
+;;    widgets.
+;;
+;;    *Please note:* Child widgets returned by the :expander function
+;;    are stored in the :args property of the tree widget.  To speed
+;;    up successive expand requests, the :expander function is not
+;;    called again when the :args value is non-nil.  To refresh child
+;;    values, it is necessary to set the :args property to nil, then
+;;    redraw the tree.
 ;;
-;;   :open-control  (default `tree-widget-open-control')
-;;   :close-control (default `tree-widget-close-control')
-;;   :empty-control (default `tree-widget-empty-control')
-;;   :leaf-control  (default `tree-widget-leaf-control')
-;;   :guide         (default `tree-widget-guide')
-;;   :end-guide     (default `tree-widget-end-guide')
-;;   :no-guide      (default `tree-widget-no-guide')
-;;   :handle        (default `tree-widget-handle')
-;;   :no-handle     (default `tree-widget-no-handle')
-;;
-;; The above nine properties define the widgets used to draw the tree.
-;; For example, using widgets that display this values:
+;; :open-control  (default `tree-widget-open-control')
+;; :close-control (default `tree-widget-close-control')
+;; :empty-control (default `tree-widget-empty-control')
+;; :leaf-control  (default `tree-widget-leaf-control')
+;; :guide         (default `tree-widget-guide')
+;; :end-guide     (default `tree-widget-end-guide')
+;; :no-guide      (default `tree-widget-no-guide')
+;; :handle        (default `tree-widget-handle')
+;; :no-handle     (default `tree-widget-no-handle')
+;;    Those properties define the widgets used to draw the tree, and
+;;    permit to customize its look and feel.  For example, using
+;;    `item' widgets with these :tag values:
 ;;
-;;   open-control     "[-] "
-;;   close-control    "[+] "
-;;   empty-control    "[X] "
-;;   leaf-control     "[>] "
-;;   guide            " |"
-;;   noguide          "  "
-;;   end-guide        " `"
-;;   handle           "-"
-;;   no-handle        " "
+;;    open-control     "[-] "      (OC)
+;;    close-control    "[+] "      (CC)
+;;    empty-control    "[X] "      (EC)
+;;    leaf-control     "[>] "      (LC)
+;;    guide            " |"        (GU)
+;;    noguide          "  "        (NG)
+;;    end-guide        " `"        (EG)
+;;    handle           "-"         (HA)
+;;    no-handle        " "         (NH)
 ;;
-;; A tree will look like this:
+;;    A tree will look like this:
 ;;
-;;   [-] 1            open-control
-;;    |-[+] 1.0       guide+handle+close-control
-;;    |-[X] 1.1       guide+handle+empty-control
-;;    `-[-] 1.2       end-guide+handle+open-control
-;;       |-[>] 1.2.1  no-guide+no-handle+guide+handle+leaf-control
-;;       `-[>] 1.2.2  no-guide+no-handle+end-guide+handle+leaf-control
+;;    [-] 1                        (OC :node)
+;;     |-[+] 1.0                   (GU+HA+CC :node)
+;;     |-[X] 1.1                   (GU+HA+EC :node)
+;;     `-[-] 1.2                   (EG+HA+OC :node)
+;;        |-[>] 1.2.1              (NG+NH+GU+HA+LC child)
+;;        `-[>] 1.2.2              (NG+NH+EG+HA+LC child)
 ;;
-;; By default, the tree widget try to use images instead of strings to
-;; draw a nice-looking tree.  See the `tree-widget-themes-directory'
-;; and `tree-widget-theme' options for more details.
-;;
+;; By default, images will be used instead of strings to draw a
+;; nice-looking tree.  See the `tree-widget-image-enable',
+;; `tree-widget-themes-directory', and `tree-widget-theme' options for
+;; more details.
 
 ;;; History:
 ;;
@@ -111,70 +106,75 @@
 ;;; Customization
 ;;
 (defgroup tree-widget nil
-  "Customization support for the Tree Widget Library."
+  "Customization support for the Tree Widget library."
   :version "22.1"
   :group 'widgets)
 
 (defcustom tree-widget-image-enable
   (not (or (featurep 'xemacs) (< emacs-major-version 21)))
-  "*non-nil means that tree-widget will try to use images."
+  "*Non-nil means that tree-widget will try to use images."
   :type  'boolean
   :group 'tree-widget)
 
 (defcustom tree-widget-themes-directory "tree-widget"
-  "*Name of the directory where to lookup for image themes.
+  "*Name of the directory where to look up for image themes.
 When nil use the directory where the tree-widget library is located.
-When a relative name is specified, try to locate that sub-directory in
+When a relative name is specified, try to locate that sub directory in
 `load-path', then in the data directory, and use the first one found.
-Default is to search for a  \"tree-widget\" sub-directory.
-
-The data directory is the value of:
-  - the variable `data-directory' on GNU Emacs;
-  - `(locate-data-directory \"tree-widget\")' on XEmacs."
+The data directory is the value of the variable `data-directory' on
+Emacs, and what `(locate-data-directory \"tree-widget\")' returns on
+XEmacs.
+The default is to use the \"tree-widget\" relative name."
   :type '(choice (const :tag "Default" "tree-widget")
                  (const :tag "With the library" nil)
                  (directory :format "%{%t%}:\n%v"))
   :group 'tree-widget)
 
 (defcustom tree-widget-theme nil
-  "*Name of the theme to use to lookup for images.
-The theme name must be a subdirectory in `tree-widget-themes-directory'.
-If nil use the \"default\" theme.
-When a image is not found in the current theme, the \"default\" theme
-is searched too.
-A complete theme should contain images with these file names:
+  "*Name of the theme where to look up for images.
+It must be a sub directory of the directory specified in variable
+`tree-widget-themes-directory'.  The default is \"default\".  When an
+image is not found in this theme, the default theme is searched too.
+A complete theme must contain images with these file names with a
+supported extension (see also `tree-widget-image-formats'):
 
-Name         Represents
------------  ------------------------------------------------
-open         opened node (for example an open folder)
-close        closed node (for example a close folder)
-empty        empty node (a node without children)
-leaf         leaf node (for example a document)
-guide        a vertical guide line
-no-guide     an invisible guide line
-end-guide    the end of a vertical guide line
-handle       an horizontal line drawn before a node control
-no-handle    an invisible handle
------------  ------------------------------------------------"
+\"open\"
+  Represent an expanded node.
+\"close\"
+  Represent a collapsed node.
+\"empty\"
+  Represent an expanded node with no child.
+\"leaf\"
+  Represent a leaf node.
+\"guide\"
+  A vertical guide line.
+\"no-guide\"
+  An invisible vertical guide line.
+\"end-guide\"
+  End of a vertical guide line.
+\"handle\"
+  Horizontal guide line that joins the vertical guide line to a node.
+\"no-handle\"
+  An invisible handle."
   :type '(choice (const  :tag "Default" nil)
                  (string :tag "Name"))
   :group 'tree-widget)
 
 (defcustom tree-widget-image-properties-emacs
   '(:ascent center :mask (heuristic t))
-  "*Properties of GNU Emacs images."
+  "*Default properties of Emacs images."
   :type 'plist
   :group 'tree-widget)
 
 (defcustom tree-widget-image-properties-xemacs
   nil
-  "*Properties of XEmacs images."
+  "*Default properties of XEmacs images."
   :type 'plist
   :group 'tree-widget)
 
 ;;; Image support
 ;;
-(eval-and-compile ;; GNU Emacs/XEmacs compatibility stuff
+(eval-and-compile ;; Emacs/XEmacs compatibility stuff
   (cond
    ;; XEmacs
    ((featurep 'xemacs)
@@ -184,12 +184,11 @@
            widget-glyph-enable
            (console-on-window-system-p)))
     (defsubst tree-widget-create-image (type file &optional props)
-      "Create an image of type TYPE from FILE.
-Give the image the specified properties PROPS.
-Return the new image."
+      "Create an image of type TYPE from FILE, and return it.
+Give the image the specified properties PROPS."
       (apply 'make-glyph `([,type :file ,file ,@props])))
     (defsubst tree-widget-image-formats ()
-      "Return the list of image formats, file name suffixes associations.
+      "Return the alist of image formats/file name extensions.
 See also the option `widget-image-file-name-suffixes'."
       (delq nil
             (mapcar
@@ -197,7 +196,7 @@
                  (and (valid-image-instantiator-format-p (car fmt)) fmt))
              widget-image-file-name-suffixes)))
     )
-   ;; GNU Emacs
+   ;; Emacs
    (t
     (defsubst tree-widget-use-image-p ()
       "Return non-nil if image support is currently enabled."
@@ -205,13 +204,12 @@
            widget-image-enable
            (display-images-p)))
     (defsubst tree-widget-create-image (type file &optional props)
-      "Create an image of type TYPE from FILE.
-Give the image the specified properties PROPS.
-Return the new image."
+      "Create an image of type TYPE from FILE, and return it.
+Give the image the specified properties PROPS."
       (apply 'create-image `(,file ,type nil ,@props)))
     (defsubst tree-widget-image-formats ()
-      "Return the list of image formats, file name suffixes associations.
-See also the option `widget-image-conversion'."
+      "Return the alist of image formats/file name extensions.
+See also the option `widget-image-file-name-suffixes'."
       (delq nil
             (mapcar
              #'(lambda (fmt)
@@ -229,12 +227,12 @@
 
 (defsubst tree-widget-set-theme (&optional name)
   "In the current buffer, set the theme to use for images.
-The current buffer should be where the tree widget is drawn.
-Optional argument NAME is the name of the theme to use, which defaults
+The current buffer must be where the tree widget is drawn.
+Optional argument NAME is the name of the theme to use.  It defaults
 to the value of the variable `tree-widget-theme'.
-Does nothing if NAME is the name of the current theme."
+Does nothing if NAME is already the current theme."
   (or name (setq name (or tree-widget-theme "default")))
-  (unless (equal name (tree-widget-theme-name))
+  (unless (string-equal name (tree-widget-theme-name))
     (set (make-local-variable 'tree-widget--theme)
          (make-vector 4 nil))
     (aset tree-widget--theme 0 name)))
@@ -265,10 +263,10 @@
        (t
         (let ((path
                (append load-path
-                       ;; The data directory depends on which, GNU
-                       ;; Emacs or XEmacs, is running.
                        (list (if (fboundp 'locate-data-directory)
+                                 ;; XEmacs
                                  (locate-data-directory "tree-widget")
+                               ;; Emacs
                                data-directory)))))
           (while (and path (not found))
             (when (car path)
@@ -286,10 +284,12 @@
   (aset tree-widget--theme 2 props))
 
 (defun tree-widget-image-properties (file)
-  "Return properties of images in current theme.
-If the \"tree-widget-theme-setup.el\" file exists in the directory
-where is located the image FILE, load it to setup theme images
-properties.  Typically that file should contain something like this:
+  "Return the properties of an image in current theme.
+FILE is the absolute file name of an image.
+
+If there is a \"tree-widget-theme-setup\" library in the theme
+directory, where is located FILE, load it to setup theme images
+properties.  Typically it should contain something like this:
 
   (tree-widget-set-image-properties
    (if (featurep 'xemacs)
@@ -297,148 +297,170 @@
      '(:ascent center :mask (heuristic t))
      ))
 
-By default, use the global properties provided in variables
-`tree-widget-image-properties-emacs' or
+Default global properties are provided for respectively Emacs and
+XEmacs in the variables `tree-widget-image-properties-emacs', and
 `tree-widget-image-properties-xemacs'."
   ;; If properties are in the cache, use them.
-  (or (aref tree-widget--theme 2)
-      (progn
-        ;; Load tree-widget-theme-setup if available.
-        (load (expand-file-name
-               "tree-widget-theme-setup"
-               (file-name-directory file)) t t)
-        ;; If properties have been setup, use them.
-        (or (aref tree-widget--theme 2)
-            ;; By default, use supplied global properties.
-            (tree-widget-set-image-properties
-             (if (featurep 'xemacs)
-                 tree-widget-image-properties-xemacs
-               tree-widget-image-properties-emacs))))))
+  (let ((plist (aref tree-widget--theme 2)))
+    (unless plist
+      ;; Load tree-widget-theme-setup if available.
+      (load (expand-file-name "tree-widget-theme-setup"
+                              (file-name-directory file)) t t)
+      ;; If properties have been setup, use them.
+      (unless (setq plist (aref tree-widget--theme 2))
+        ;; By default, use supplied global properties.
+        (setq plist (if (featurep 'xemacs)
+                        tree-widget-image-properties-xemacs
+                      tree-widget-image-properties-emacs))
+        ;; Setup the cache.
+        (tree-widget-set-image-properties plist)))
+    plist))
+
+(defconst tree-widget--cursors
+  ;; Pointer shapes when the mouse pointer is over tree-widget images.
+  ;; This feature works since Emacs 22, and ignored on older versions,
+  ;; and XEmacs.
+  '(
+    ("open"      . hand )
+    ("close"     . hand )
+    ("empty"     . arrow)
+    ("leaf"      . arrow)
+    ("guide"     . arrow)
+    ("no-guide"  . arrow)
+    ("end-guide" . arrow)
+    ("handle"    . arrow)
+    ("no-handle" . arrow)
+    ))
+
+(defun tree-widget-lookup-image (name)
+  "Look up in current theme for an image with NAME.
+Search first in current theme, then in default theme (see also the
+variable `tree-widget-theme').
+Return the first image found having a supported format, or nil if not
+found."
+  (let ((default-directory (tree-widget-themes-directory)))
+    (when default-directory
+      (let (file (theme (tree-widget-theme-name)))
+        (catch 'found
+          (dolist (dir (if (string-equal theme "default")
+                           '("default") (list theme "default")))
+            (dolist (fmt (tree-widget-image-formats))
+              (dolist (ext (cdr fmt))
+                (setq file (expand-file-name (concat name ext) dir))
+                (and
+                 (file-readable-p file)
+                 (file-regular-p file)
+                 (throw
+                  'found
+                  (tree-widget-create-image
+                   (car fmt) file
+                   ;; Add the pointer shape
+                   (cons :pointer
+                         (cons
+                          (cdr (assoc name tree-widget--cursors))
+                          (tree-widget-image-properties file)))))))))
+          nil)))))
 
 (defun tree-widget-find-image (name)
   "Find the image with NAME in current theme.
 NAME is an image file name sans extension.
-Search first in current theme, then in default theme.
-A theme is a sub-directory of the root theme directory specified in
-variable `tree-widget-themes-directory'.
-Return the first image found having a supported format in those
-returned by the function `tree-widget-image-formats', or nil if not
-found."
+Return the image found, or nil if not found."
   (when (tree-widget-use-image-p)
     ;; Ensure there is an active theme.
     (tree-widget-set-theme (tree-widget-theme-name))
-    ;; If the image is in the cache, return it.
-    (or (cdr (assoc name (aref tree-widget--theme 3)))
-        ;; Search the image in the current, then default themes.
-        (let ((default-directory (tree-widget-themes-directory)))
-          (when default-directory
-            (let* ((theme (tree-widget-theme-name))
-                   (path (mapcar 'expand-file-name
-                                 (if (equal theme "default")
-                                     '("default")
-                                   (list theme "default"))))
-                   (formats (tree-widget-image-formats))
-                   (found
-                    (catch 'found
-                      (dolist (dir path)
-                        (dolist (fmt formats)
-                          (dolist (ext (cdr fmt))
-                            (let ((file (expand-file-name
-                                         (concat name ext) dir)))
-                              (and (file-readable-p file)
-                                   (file-regular-p file)
-                                   (throw 'found
-                                          (cons (car fmt) file)))))))
-                      nil)))
-              (when found
-                (let ((image
-                       (tree-widget-create-image
-                        (car found) (cdr found)
-                        (tree-widget-image-properties (cdr found)))))
-                  ;; Store image in the cache for later use.
-                  (push (cons name image) (aref tree-widget--theme 3))
-                  image))))))))
+    (let ((image (assoc name (aref tree-widget--theme 3))))
+      ;; The image NAME is found in the cache.
+      (if image
+          (cdr image)
+        ;; Search the image in current, and default themes.
+        (prog1
+            (setq image (tree-widget-lookup-image name))
+          ;; Store image reference in the cache for later use.
+          (push (cons name image) (aref tree-widget--theme 3))))
+      )))
 
 ;;; Widgets
 ;;
 (defvar tree-widget-button-keymap
-  (let (parent-keymap mouse-button1 keymap)
-    (if (featurep 'xemacs)
-        (setq parent-keymap widget-button-keymap
-              mouse-button1 [button1])
-      (setq parent-keymap widget-keymap
-            mouse-button1 [down-mouse-1]))
-    (setq keymap (copy-keymap parent-keymap))
-    (define-key keymap mouse-button1 'widget-button-click)
-    keymap)
-  "Keymap used inside node handle buttons.")
+  (let ((km (make-sparse-keymap)))
+    (if (boundp 'widget-button-keymap)
+        ;; XEmacs
+        (progn
+          (set-keymap-parent km widget-button-keymap)
+          (define-key km [button1] 'widget-button-click))
+      ;; Emacs
+      (set-keymap-parent km widget-keymap)
+      (define-key km [down-mouse-1] 'widget-button-click))
+    km)
+  "Keymap used inside node buttons.
+Handle mouse button 1 click on buttons.")
 
 (define-widget 'tree-widget-control 'push-button
-  "Base `tree-widget' control."
+  "Basic widget other tree-widget node buttons are derived from."
   :format        "%[%t%]"
   :button-keymap tree-widget-button-keymap ; XEmacs
   :keymap        tree-widget-button-keymap ; Emacs
   )
 
 (define-widget 'tree-widget-open-control 'tree-widget-control
-  "Control widget that represents a opened `tree-widget' node."
+  "Button for an expanded tree-widget node."
   :tag       "[-] "
   ;;:tag-glyph (tree-widget-find-image "open")
   :notify    'tree-widget-close-node
-  :help-echo "Hide node"
+  :help-echo "Collapse node"
   )
 
 (define-widget 'tree-widget-empty-control 'tree-widget-open-control
-  "Control widget that represents an empty opened `tree-widget' node."
+  "Button for an expanded tree-widget node with no child."
   :tag       "[X] "
   ;;:tag-glyph (tree-widget-find-image "empty")
   )
 
 (define-widget 'tree-widget-close-control 'tree-widget-control
-  "Control widget that represents a closed `tree-widget' node."
+  "Button for a collapsed tree-widget node."
   :tag       "[+] "
   ;;:tag-glyph (tree-widget-find-image "close")
   :notify    'tree-widget-open-node
-  :help-echo "Show node"
+  :help-echo "Expand node"
   )
 
 (define-widget 'tree-widget-leaf-control 'item
-  "Control widget that represents a leaf node."
-  :tag       " " ;; Need at least a char to display the image :-(
+  "Representation of a tree-widget leaf node."
+  :tag       " " ;; Need at least one char to display the image :-(
   ;;:tag-glyph (tree-widget-find-image "leaf")
   :format    "%t"
   )
 
 (define-widget 'tree-widget-guide 'item
-  "Widget that represents a guide line."
+  "Vertical guide line."
   :tag       " |"
   ;;:tag-glyph (tree-widget-find-image "guide")
   :format    "%t"
   )
 
 (define-widget 'tree-widget-end-guide 'item
-  "Widget that represents the end of a guide line."
+  "End of a vertical guide line."
   :tag       " `"
   ;;:tag-glyph (tree-widget-find-image "end-guide")
   :format    "%t"
   )
 
 (define-widget 'tree-widget-no-guide 'item
-  "Widget that represents an invisible guide line."
+  "Invisible vertical guide line."
   :tag       "  "
   ;;:tag-glyph (tree-widget-find-image "no-guide")
   :format    "%t"
   )
 
 (define-widget 'tree-widget-handle 'item
-  "Widget that represent a node handle."
+  "Horizontal guide line that joins a vertical guide line to a node."
   :tag       " "
   ;;:tag-glyph (tree-widget-find-image "handle")
   :format    "%t"
   )
 
 (define-widget 'tree-widget-no-handle 'item
-  "Widget that represent an invisible node handle."
+  "Invisible handle."
   :tag       " "
   ;;:tag-glyph (tree-widget-find-image "no-handle")
   :format    "%t"
@@ -449,96 +471,60 @@
   :format         "%v"
   :convert-widget 'widget-types-convert-widget
   :value-get      'widget-value-value-get
+  :value-delete   'widget-children-value-delete
   :value-create   'tree-widget-value-create
-  :value-delete   'tree-widget-value-delete
+  :open-control   'tree-widget-open-control
+  :close-control  'tree-widget-close-control
+  :empty-control  'tree-widget-empty-control
+  :leaf-control   'tree-widget-leaf-control
+  :guide          'tree-widget-guide
+  :end-guide      'tree-widget-end-guide
+  :no-guide       'tree-widget-no-guide
+  :handle         'tree-widget-handle
+  :no-handle      'tree-widget-no-handle
   )
 
 ;;; Widget support functions
 ;;
 (defun tree-widget-p (widget)
-  "Return non-nil if WIDGET is a `tree-widget' widget."
+  "Return non-nil if WIDGET is a tree-widget."
   (let ((type (widget-type widget)))
     (while (and type (not (eq type 'tree-widget)))
       (setq type (widget-type (get type 'widget-type))))
     (eq type 'tree-widget)))
 
-(defsubst tree-widget-get-super (widget property)
-  "Return WIDGET's inherited PROPERTY value."
-  (widget-get (get (widget-type (get (widget-type widget)
-                                     'widget-type))
-                   'widget-type)
-              property))
-
-(defsubst tree-widget-node (widget)
-  "Return the tree WIDGET :node value.
-If not found setup a default 'item' widget."
+(defun tree-widget-node (widget)
+  "Return WIDGET's :node child widget.
+If not found, setup an `item' widget as default.
+Signal an error if the :node widget is a tree-widget.
+WIDGET is, or derives from, a tree-widget."
   (let ((node (widget-get widget :node)))
-    (unless node
+    (if node
+        ;; Check that the :node widget is not a tree-widget.
+        (and (tree-widget-p node)
+             (error "Invalid tree-widget :node %S" node))
+      ;; Setup an item widget as default :node.
       (setq node `(item :tag ,(or (widget-get widget :tag)
                                   (widget-princ-to-string
                                    (widget-value widget)))))
       (widget-put widget :node node))
     node))
 
-(defsubst tree-widget-open-control (widget)
-  "Return the opened node control specified in WIDGET."
-  (or (widget-get widget :open-control)
-      'tree-widget-open-control))
-
-(defsubst tree-widget-close-control (widget)
-  "Return the closed node control specified in WIDGET."
-  (or (widget-get widget :close-control)
-      'tree-widget-close-control))
-
-(defsubst tree-widget-empty-control (widget)
-  "Return the empty node control specified in WIDGET."
-  (or (widget-get widget :empty-control)
-      'tree-widget-empty-control))
-
-(defsubst tree-widget-leaf-control (widget)
-  "Return the leaf node control specified in WIDGET."
-  (or (widget-get widget :leaf-control)
-      'tree-widget-leaf-control))
-
-(defsubst tree-widget-guide (widget)
-  "Return the guide line widget specified in WIDGET."
-  (or (widget-get widget :guide)
-      'tree-widget-guide))
-
-(defsubst tree-widget-end-guide (widget)
-  "Return the end of guide line widget specified in WIDGET."
-  (or (widget-get widget :end-guide)
-      'tree-widget-end-guide))
-
-(defsubst tree-widget-no-guide (widget)
-  "Return the invisible guide line widget specified in WIDGET."
-  (or (widget-get widget :no-guide)
-      'tree-widget-no-guide))
-
-(defsubst tree-widget-handle (widget)
-  "Return the node handle line widget specified in WIDGET."
-  (or (widget-get widget :handle)
-      'tree-widget-handle))
-
-(defsubst tree-widget-no-handle (widget)
-  "Return the node invisible handle line widget specified in WIDGET."
-  (or (widget-get widget :no-handle)
-      'tree-widget-no-handle))
-
 (defun tree-widget-keep (arg widget)
-  "Save in ARG the WIDGET properties specified by :keep."
+  "Save in ARG the WIDGET's properties specified by :keep."
   (dolist (prop (widget-get widget :keep))
     (widget-put arg prop (widget-get widget prop))))
 
 (defun tree-widget-children-value-save (widget &optional args node)
   "Save WIDGET children values.
-Children properties and values are saved in ARGS if non-nil else in
-WIDGET :args property value.  Data node properties and value are saved
-in NODE if non-nil else in WIDGET :node property value."
-  (let ((args       (or args (widget-get widget :args)))
-        (node       (or node (tree-widget-node widget)))
-        (children   (widget-get widget :children))
-        (node-child (widget-get widget :tree-widget--node))
+WIDGET is, or derives from, a tree-widget.
+Children properties and values are saved in ARGS if non-nil, else in
+WIDGET's :args property value.  Properties and values of the
+WIDGET's :node sub-widget are saved in NODE if non-nil, else in
+WIDGET's :node sub-widget."
+  (let ((args (cons (or node (widget-get widget :node))
+                    (or args (widget-get widget :args))))
+        (children (widget-get widget :children))
         arg child)
     (while (and args children)
       (setq arg      (car args)
@@ -550,7 +536,7 @@
            (progn
              ;; Backtrack :args and :node properties.
              (widget-put arg :args (widget-get child :args))
-             (widget-put arg :node (tree-widget-node child))
+             (widget-put arg :node (widget-get child :node))
              ;; Save :open property.
              (widget-put arg :open (widget-get child :open))
              ;; The node is open.
@@ -563,30 +549,22 @@
                (tree-widget-children-value-save
                 child (widget-get arg :args) (widget-get arg :node))))
 ;;;; Another non tree node.
-         ;; Save the widget value
+         ;; Save the widget value.
          (widget-put arg :value (widget-value child))
          ;; Save properties specified in :keep.
-         (tree-widget-keep arg child)))
-    (when (and node node-child)
-      ;; Assume that the node child widget is not a tree!
-      ;; Save the node child widget value.
-      (widget-put node :value (widget-value node-child))
-      ;; Save the node child properties specified in :keep.
-      (tree-widget-keep node node-child))
-    ))
+         (tree-widget-keep arg child)))))
 
 (defvar tree-widget-after-toggle-functions nil
-  "Hooks run after toggling a `tree-widget' folding.
-Each function will receive the `tree-widget' as its unique argument.
-This variable should be local to each buffer used to display
-widgets.")
+  "Hooks run after toggling a tree-widget expansion.
+Each function will receive the tree-widget as its unique argument.
+This hook should be local in the buffer used to display widgets.")
 
 (defun tree-widget-close-node (widget &rest ignore)
-  "Close the `tree-widget' node associated to this control WIDGET.
-WIDGET's parent should be a `tree-widget'.
+  "Collapse the tree-widget, parent of WIDGET.
+WIDGET is, or derives from, a tree-widget-open-control widget.
 IGNORE other arguments."
   (let ((tree (widget-get widget :parent)))
-    ;; Before folding the node up, save children values so next open
+    ;; Before to collapse the node, save children values so next open
     ;; can recover them.
     (tree-widget-children-value-save tree)
     (widget-put tree :open nil)
@@ -594,131 +572,104 @@
     (run-hook-with-args 'tree-widget-after-toggle-functions tree)))
 
 (defun tree-widget-open-node (widget &rest ignore)
-  "Open the `tree-widget' node associated to this control WIDGET.
-WIDGET's parent should be a `tree-widget'.
+  "Expand the tree-widget, parent of WIDGET.
+WIDGET is, or derives from, a tree-widget-close-control widget.
 IGNORE other arguments."
   (let ((tree (widget-get widget :parent)))
     (widget-put tree :open t)
     (widget-value-set tree t)
     (run-hook-with-args 'tree-widget-after-toggle-functions tree)))
 
-(defun tree-widget-value-delete (widget)
-  "Delete tree WIDGET children."
-  ;; Delete children
-  (widget-children-value-delete widget)
-  ;; Delete node child
-  (widget-delete (widget-get widget :tree-widget--node))
-  (widget-put widget :tree-widget--node nil))
-
 (defun tree-widget-value-create (tree)
-  "Create the TREE widget."
-  (let* ((widget-image-enable (tree-widget-use-image-p))     ; Emacs
+  "Create the TREE tree-widget."
+  (let* ((node   (tree-widget-node tree))
+         (flags  (widget-get tree :tree-widget--guide-flags))
+         (indent (widget-get tree :indent))
+         ;; Setup widget's image support.  Looking up for images, and
+         ;; setting widgets' :tag-glyph is done here, to allow to
+         ;; dynamically change the image theme.
+         (widget-image-enable (tree-widget-use-image-p))     ; Emacs
          (widget-glyph-enable widget-image-enable)           ; XEmacs
-         (node (tree-widget-node tree))
-         (flags (widget-get tree :tree-widget--guide-flags))
-         (indent (widget-get tree :indent))
          children buttons)
     (and indent (not (widget-get tree :parent))
          (insert-char ?\  indent))
     (if (widget-get tree :open)
-;;;; Unfolded node.
+;;;; Expanded node.
         (let ((args     (widget-get tree :args))
-              (dynargs  (widget-get tree :dynargs))
-              (guide    (tree-widget-guide     tree))
-              (noguide  (tree-widget-no-guide  tree))
-              (endguide (tree-widget-end-guide tree))
-              (handle   (tree-widget-handle    tree))
-              (nohandle (tree-widget-no-handle tree))
-              ;; Lookup for images and set widgets' tag-glyphs here,
-              ;; to allow to dynamically change the image theme.
+              (xpandr   (or (widget-get tree :expander)
+                            (widget-get tree :dynargs)))
+              (leaf     (widget-get tree :leaf-control))
+              (guide    (widget-get tree :guide))
+              (noguide  (widget-get tree :no-guide))
+              (endguide (widget-get tree :end-guide))
+              (handle   (widget-get tree :handle))
+              (nohandle (widget-get tree :no-handle))
+              (leafi    (tree-widget-find-image "leaf"))
               (guidi    (tree-widget-find-image "guide"))
               (noguidi  (tree-widget-find-image "no-guide"))
               (endguidi (tree-widget-find-image "end-guide"))
               (handli   (tree-widget-find-image "handle"))
               (nohandli (tree-widget-find-image "no-handle"))
               child)
-          (when dynargs
-            ;; Request the definition of dynamic children
-            (setq dynargs (funcall dynargs tree))
-            ;; Unless children have changed, reuse the widgets
-            (unless (eq args dynargs)
-              (setq args (mapcar 'widget-convert dynargs))
-              (widget-put tree :args args)))
-          ;; Insert the node control
+          ;; Request children at run time, when not already done.
+          (when (and (not args) xpandr)
+            (setq args (mapcar 'widget-convert (funcall xpandr tree)))
+            (widget-put tree :args args))
+          ;; Insert the node "open" button.
           (push (widget-create-child-and-convert
-                 tree (if args (tree-widget-open-control tree)
-                        (tree-widget-empty-control tree))
+                 tree (widget-get
+                       tree (if args :open-control :empty-control))
                  :tag-glyph (tree-widget-find-image
                              (if args "open" "empty")))
                 buttons)
-          ;; Insert the node element
-          (widget-put tree :tree-widget--node
-                      (widget-create-child-and-convert tree node))
-          ;; Insert children
+          ;; Insert the :node element.
+          (push (widget-create-child-and-convert tree node)
+                children)
+          ;; Insert children.
           (while args
             (setq child (car args)
                   args  (cdr args))
             (and indent (insert-char ?\  indent))
-            ;; Insert guide lines elements
+            ;; Insert guide lines elements from previous levels.
             (dolist (f (reverse flags))
               (widget-create-child-and-convert
                tree (if f guide noguide)
                :tag-glyph (if f guidi noguidi))
               (widget-create-child-and-convert
-               tree nohandle :tag-glyph nohandli)
-              )
+               tree nohandle :tag-glyph nohandli))
+            ;; Insert guide line element for this level.
             (widget-create-child-and-convert
              tree (if args guide endguide)
              :tag-glyph (if args guidi endguidi))
             ;; Insert the node handle line
             (widget-create-child-and-convert
              tree handle :tag-glyph handli)
-            ;; If leaf node, insert a leaf node control
+            ;; If leaf node, insert a leaf node button.
             (unless (tree-widget-p child)
               (push (widget-create-child-and-convert
-                     tree (tree-widget-leaf-control tree)
-                     :tag-glyph (tree-widget-find-image "leaf"))
+                     tree leaf :tag-glyph leafi)
                     buttons))
-            ;; Insert the child element
+            ;; Finally, insert the child widget.
             (push (widget-create-child-and-convert
                    tree child
                    :tree-widget--guide-flags (cons (if args t) flags))
                   children)))
-;;;; Folded node.
-      ;; Insert the closed node control
+;;;; Collapsed node.
+      ;; Insert the "closed" node button.
       (push (widget-create-child-and-convert
-             tree (tree-widget-close-control tree)
+             tree (widget-get tree :close-control)
              :tag-glyph (tree-widget-find-image "close"))
             buttons)
-      ;; Insert the node element
-      (widget-put tree :tree-widget--node
-                  (widget-create-child-and-convert tree node)))
-    ;; Save widget children and buttons
+      ;; Insert the :node element.
+      (push (widget-create-child-and-convert tree node)
+            children))
+    ;; Save widget children and buttons.  The :node child is the first
+    ;; element in children.
     (widget-put tree :children (nreverse children))
     (widget-put tree :buttons  buttons)
     ))
-
-;;; Utilities
-;;
-(defun tree-widget-map (widget fun)
-  "For each WIDGET displayed child call function FUN.
-FUN is called with three arguments like this:
-
- (FUN CHILD IS-NODE WIDGET)
-
-where:
-- - CHILD is the child widget.
-- - IS-NODE is non-nil if CHILD is WIDGET node widget."
-  (when (widget-get widget :tree-widget--node)
-    (funcall fun (widget-get widget :tree-widget--node) t widget)
-    (dolist (child (widget-get widget :children))
-      (if (tree-widget-p child)
-          ;; The child is a tree node.
-          (tree-widget-map child fun)
-        ;; Another non tree node.
-        (funcall fun child nil widget)))))
 
 (provide 'tree-widget)
 
-;;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8
+;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8
 ;;; tree-widget.el ends here
--- a/lisp/type-break.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/type-break.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/uniquify.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/uniquify.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-about.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-about.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-auth.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-auth.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-cache.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-cache.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-cid.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-cid.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-cookie.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-cookie.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-dav.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-dav.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;; DAV is in RFC 2518.
 
--- a/lisp/url/url-dired.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-dired.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-expand.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-expand.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-file.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-file.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-ftp.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-ftp.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-gw.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-gw.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Code:
 
--- a/lisp/url/url-handlers.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-handlers.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-history.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-history.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-http.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-http.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-https.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-https.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-imap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-imap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-irc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-irc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-ldap.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-ldap.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-mailto.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-mailto.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-methods.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-methods.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-misc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-misc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-news.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-news.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-nfs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-nfs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-ns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-ns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-parse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-parse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-privacy.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-privacy.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-proxy.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-proxy.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url-util.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-util.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/url/url-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Code:
 
--- a/lisp/url/url.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/url.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/url/vc-dav.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/url/vc-dav.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 
 ;;; Commentary:
--- a/lisp/userlock.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/userlock.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/vc-arch.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-arch.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/vc-cvs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-cvs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/vc-hooks.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-hooks.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/vc-mcvs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-mcvs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/vc-rcs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-rcs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/vc-sccs.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-sccs.el	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.
 
 ;;; Commentary:
 
--- a/lisp/vc-svn.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc-svn.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/vc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Credits:
 
--- a/lisp/vcursor.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vcursor.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/version.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/version.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/view.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/view.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/vms-patch.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vms-patch.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/vmsproc.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vmsproc.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/vt-control.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vt-control.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/vt100-led.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/vt100-led.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/w32-fns.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/w32-fns.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/w32-vars.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/w32-vars.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lisp/wdired.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/wdired.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/whitespace.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/whitespace.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/wid-browse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/wid-browse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/wid-edit.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/wid-edit.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Wishlist items (from widget.texi):
 
--- a/lisp/widget.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/widget.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 ;;
--- a/lisp/windmove.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/windmove.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 ;;
 ;; --------------------------------------------------------------------
 
--- a/lisp/window.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/window.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/winner.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/winner.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/woman.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/woman.el	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 ;;; Commentary:
 
--- a/lisp/x-dnd.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/x-dnd.el	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.
 
 ;;; Commentary:
 
--- a/lisp/xml.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/xml.el	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 ;;; Commentary:
 
--- a/lisp/xt-mouse.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/lisp/xt-mouse.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary:
 
--- a/lispintro/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispintro/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 SHELL = @SHELL@
 
--- a/lispintro/emacs-lisp-intro.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispintro/emacs-lisp-intro.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -192,8 +192,8 @@
 GNU Press,                      @hfill  @uref{http://www.gnupress.org}@*
 a division of the               @hfill General: @email{press@@gnu.org}@*
 Free Software Foundation, Inc.  @hfill Orders:@w{ }  @email{sales@@gnu.org}@*
-59 Temple Place, Suite 330      @hfill Tel: +1 (617) 542-5942@*
-Boston, MA 02111-1307 USA       @hfill Fax: +1 (617) 542-2652@*
+51 Franklin Street, Fifth Floor @hfill Tel: +1 (617) 542-5942@*
+Boston, MA 02110-1301 USA       @hfill Fax: +1 (617) 542-2652@*
 @end iftex
 
 @ifnottex
@@ -203,8 +203,8 @@
 GNU Press,                          Website: http://www.gnupress.org
 a division of the                   General: press@@gnu.org
 Free Software Foundation, Inc.      Orders:  sales@@gnu.org
-59 Temple Place, Suite 330          Tel: +1 (617) 542-5942
-Boston, MA 02111-1307 USA           Fax: +1 (617) 542-2652
+51 Franklin Street, Fifth Floor     Tel: +1 (617) 542-5942
+Boston, MA 02110-1301 USA           Fax: +1 (617) 542-2652
 @end example
 @end ifnottex
 
@@ -21333,7 +21333,7 @@
 
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, 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.
--- a/lispintro/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispintro/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 srcdir = .
 
--- a/lispintro/missing	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispintro/missing	Tue Jul 05 22:22:24 2005 +0000
@@ -15,8 +15,8 @@
 
 # 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 Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
--- a/lispintro/texinfo.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispintro/texinfo.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -20,8 +20,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 %
 % In other words, you are welcome to use, share and improve this program.
 % You are forbidden to forbid anyone else to use, share and improve
--- a/lispref/ChangeLog	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/ChangeLog	Tue Jul 05 22:22:24 2005 +0000
@@ -1,3 +1,7 @@
+2005-07-04  Richard M. Stallman  <rms@gnu.org>
+
+	* hooks.texi (Standard Hooks): Add occur-hook.
+
 2005-07-03  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* display.texi (The Echo Area): Correct menu.
--- a/lispref/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = @srcdir@
--- a/lispref/doclicense.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/doclicense.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -6,7 +6,7 @@
 
 @display
 Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, 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.
--- a/lispref/gpl.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/gpl.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -8,7 +8,7 @@
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111, USA
+51 Franklin Street, 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.
@@ -354,7 +354,8 @@
 
 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, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
--- a/lispref/hooks.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/hooks.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -217,6 +217,8 @@
 @item nongregorian-diary-marking-hook
 @inforef{Hebrew/Islamic Entries,, emacs-xtra}.
 
+@item occur-hook
+
 @item post-command-hook
 @xref{Command Overview}.
 
--- a/lispref/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = .
--- a/lispref/tindex.pl	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/tindex.pl	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 require 5;
 use Getopt::Long;
--- a/lispref/tips.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/tips.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -425,8 +425,8 @@
 
 ;; 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
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA
 @end smallexample
 
 If you have signed papers to assign the copyright to the Foundation,
@@ -895,8 +895,8 @@
 
 ;; This file is part of GNU Emacs.
 @dots{}
-;; 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.
 @end group
 @end smallexample
 
--- a/lispref/vol1.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/vol1.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -134,8 +134,8 @@
 @c than the foobar edition").  --mew 13sep93
 
 Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA  02110-1301 USA
 @end ifinfo
 
 @setchapternewpage odd
@@ -173,8 +173,8 @@
 
 @sp 2
 Published by the Free Software Foundation @*
-59 Temple Place, Suite 330 @*
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor @*
+Boston, MA  02110-1301 USA
 
 @sp 1
 Permission is granted to make and distribute verbatim copies of this
--- a/lispref/vol2.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/lispref/vol2.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -135,8 +135,8 @@
 @c than the foobar edition").  --mew 13sep93
 
 Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA  02110-1301 USA
 @end ifinfo
 
 @setchapternewpage odd
@@ -174,8 +174,8 @@
 
 @sp 2
 Published by the Free Software Foundation @*
-59 Temple Place, Suite 330 @*
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor @*
+Boston, MA  02110-1301 USA
 
 @sp 1
 Permission is granted to make and distribute verbatim copies of this
--- a/lwlib/lwlib-Xaw.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib-Xaw.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xlw.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib-Xlw.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xm.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib-Xm.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib-Xm.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib-Xm.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef LWLIB_XM_H
 #define LWLIB_XM_H
--- a/lwlib/lwlib-utils.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib-utils.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/lwlib.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef NeXT
 #undef __STRICT_BSD__ /* ick */
--- a/lwlib/xlwmenu.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/xlwmenu.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Created by devin@lucid.com */
 
--- a/lwlib/xlwmenu.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/xlwmenu.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
--- a/lwlib/xlwmenuP.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/lwlib/xlwmenuP.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
--- a/mac/cw6-mcp.xml	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/cw6-mcp.xml	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 
 Contributed by Andrew Choi (akochoi@mac.com).
--- a/mac/inc/alloca.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/alloca.h	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.  */
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/config.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/config.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/defs-cw6.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/defs-cw6.h	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.  */
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/dirent.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/dirent.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/epaths.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/epaths.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/grp.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/grp.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _GRP_H
 #define _GRP_H
--- a/mac/inc/m-mac.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/m-mac.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/pwd.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/pwd.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/s-mac.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/s-mac.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/file.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/file.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/ioctl.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/ioctl.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/param.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/param.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/stat.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/stat.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/time.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/time.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/sys/types.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/sys/types.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/termio.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/termio.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/utime.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/utime.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/inc/utsname.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/inc/utsname.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/make-package	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/make-package	Tue Jul 05 22:22:24 2005 +0000
@@ -34,8 +34,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.
 #
 # Contributed by Steven Tamm (steventamm@mac.com).
 
--- a/mac/makefile.MPW	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/makefile.MPW	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.  */
 #
 # Defines the following targets:
 #   Emacs (default) - normal Carbon Emacs build.
--- a/mac/src/Emacs.r	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/src/Emacs.r	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/src/EmacsMPW.r	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/src/EmacsMPW.r	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/mac/src/chdir.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/mac/src/chdir.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/make-dist	Tue Jul 05 22:12:55 2005 +0000
+++ b/make-dist	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.
 
 progname="$0"
 
--- a/man/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Where to find the source code.  $(srcdir) will be the man
 # subdirectory of the source tree.  This is
--- a/man/calc.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/calc.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -187,7 +187,7 @@
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, 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.
@@ -533,7 +533,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.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
--- a/man/doclicense.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/doclicense.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -5,7 +5,7 @@
 
 @display
 Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, 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.
--- a/man/faq.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/faq.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -518,8 +518,8 @@
 
 @item Postal address
 Free Software Foundation@*
-59 Temple Place - Suite 330@*
-Boston, MA 02111-1307@*
+51 Franklin Street, Fifth Floor@*
+Boston, MA 02110-1301@*
 USA@*
 
 @end table
--- a/man/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in $(srcdir)/src, and the source code for Emacs's
--- a/man/mh-e.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/mh-e.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -3540,7 +3540,7 @@
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, 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.
@@ -3886,7 +3886,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.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
--- a/man/texinfo.tex	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/texinfo.tex	Tue Jul 05 22:22:24 2005 +0000
@@ -20,8 +20,8 @@
 %
 % You should have received a copy of the GNU General Public License
 % along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 %
 % In other words, you are welcome to use, share and improve this program.
 % You are forbidden to forbid anyone else to use, share and improve
--- a/man/trouble.texi	Tue Jul 05 22:12:55 2005 +0000
+++ b/man/trouble.texi	Tue Jul 05 22:22:24 2005 +0000
@@ -595,8 +595,8 @@
 @format
 GNU Emacs Bugs
 Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301 USA
 @end format
 
   We do not promise to fix the bug; but if the bug is serious,
--- a/msdos/mainmake	Tue Jul 05 22:12:55 2005 +0000
+++ b/msdos/mainmake	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.
 
 # make all	to compile and build Emacs.
 # make install	to install it.
--- a/msdos/mainmake.v2	Tue Jul 05 22:12:55 2005 +0000
+++ b/msdos/mainmake.v2	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # make all	to compile and build Emacs.
 # make install	to install it (installs in-place, in `bin' subdir of top dir).
--- a/nt/addpm.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/addpm.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /****************************************************************************
  *
--- a/nt/addsection.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/addsection.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Andrew Innes <andrewi@harlequin.co.uk>       04-Jan-1999
      based on code from unexw32.c
--- a/nt/cmdproxy.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/cmdproxy.c	Tue Jul 05 22:22:24 2005 +0000
@@ -26,8 +26,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.  */
 
 #include <windows.h>
 
--- a/nt/config.nt	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/config.nt	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* No code in Emacs #includes config.h twice, but some of the code
--- a/nt/configure.bat	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/configure.bat	Tue Jul 05 22:22:24 2005 +0000
@@ -18,8 +18,8 @@
 
 rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs; see the file COPYING.  If not, write to the
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem   Boston, MA 02111-1307, USA.
+rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+rem   Boston, MA 02110-1301, USA.
 rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem
--- a/nt/ddeclient.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/ddeclient.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <windows.h>
 #include <ddeml.h>
--- a/nt/envadd.bat	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/envadd.bat	Tue Jul 05 22:22:24 2005 +0000
@@ -17,8 +17,8 @@
 rem
 rem  You should have received a copy of the GNU General Public License
 rem  along with GNU Emacs; see the file COPYING.  If not, write to
-rem  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem  Boston, MA 02111-1307, USA.
+rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+rem  Boston, MA 02110-1301, USA.
 rem
 rem
 rem  Usage:
--- a/nt/gmake.defs	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/gmake.defs	Tue Jul 05 22:22:24 2005 +0000
@@ -13,8 +13,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.
 
 # Ensure 'all' is the default target
 all:
--- a/nt/inc/gettext.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/inc/gettext.h	Tue Jul 05 22:22:24 2005 +0000
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library 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.  */
 
 #ifndef _LIBGETTEXT_H
--- a/nt/inc/grp.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/inc/grp.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _GRP_H
 #define _GRP_H
--- a/nt/inc/sys/socket.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/inc/sys/socket.h	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.  */
 
 
 /* Workable version of <sys/socket.h> based on winsock.h */
--- a/nt/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 
 ALL		= addpm ddeclient runemacs cmdproxy addsection preprep
 
--- a/nt/multi-install-info.bat	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/multi-install-info.bat	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,8 @@
 rem
 rem  You should have received a copy of the GNU General Public License
 rem  along with GNU Emacs; see the file COPYING.  If not, write to
-rem  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-rem  Boston, MA 02111-1307, USA.
+rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+rem  Boston, MA 02110-1301, USA.
 rem
 rem
 rem  Usage:
--- a/nt/nmake.defs	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/nmake.defs	Tue Jul 05 22:22:24 2005 +0000
@@ -13,8 +13,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.
 
 # Ensure 'all' is the default target
 all:
--- a/nt/paths.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/paths.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The default search path for Lisp function "load".
--- a/nt/preprep.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/nt/preprep.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Andrew Innes <andrewi@harlequin.co.uk>       16-Jan-1999
      based on code from addsection.c
--- a/src/.gdbinit	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/.gdbinit	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 # Force loading of symbols, enough to give us gdb_valbits etc.
 set main
--- a/src/Makefile.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/Makefile.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 
 # Note that this file is edited by msdos/sed1v2.inp for MSDOS.  That
--- a/src/abbrev.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/abbrev.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/alloc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/alloc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/atimer.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/atimer.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/atimer.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/atimer.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_ATIMER_H
 #define EMACS_ATIMER_H
--- a/src/blockinput.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/blockinput.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_BLOCKINPUT_H
 #define EMACS_BLOCKINPUT_H
--- a/src/buffer.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/buffer.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 
--- a/src/buffer.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/buffer.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* Accessing the parameters of the current buffer.  */
--- a/src/bytecode.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/bytecode.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 hacked on by jwz@lucid.com 17-jun-91
   o  added a compile-time switch to turn on simple sanity checking;
--- a/src/callint.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/callint.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/callproc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/callproc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/casefiddle.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/casefiddle.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/casetab.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/casetab.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by Howard Gayle.  */
 
--- a/src/category.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/category.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* Here we handle three objects: category, category set, and category
--- a/src/category.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/category.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* We introduce here three types of object: category, category set,
--- a/src/ccl.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/ccl.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
--- a/src/ccl.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/ccl.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef EMACS_CCL_H
 #define EMACS_CCL_H
--- a/src/charset.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/charset.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* At first, see the document in `charset.h' to understand the code in
    this file.  */
--- a/src/charset.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/charset.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_CHARSET_H
 #define EMACS_CHARSET_H
--- a/src/cm.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/cm.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/cm.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/cm.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
--- a/src/cmds.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/cmds.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/coding.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/coding.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*** TABLE OF CONTENTS ***
 
--- a/src/coding.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/coding.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_CODING_H
 #define EMACS_CODING_H
--- a/src/commands.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/commands.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define Ctl(c) ((c)&037)
--- a/src/composite.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/composite.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include "lisp.h"
--- a/src/composite.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/composite.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_COMPOSITE_H
 #define EMACS_COMPOSITE_H
--- a/src/config.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/config.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code
--- a/src/data.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/data.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/dired.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/dired.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/dispextern.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/dispextern.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>.  */
 
--- a/src/dispnew.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/dispnew.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/disptab.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/disptab.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Access the slots of a display-table, according to their purpose.  */
 
--- a/src/doc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/doc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/doprnt.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/doprnt.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/dosfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/dosfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
--- a/src/dosfns.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/dosfns.h	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.  */
 
 extern EMACS_INT dos_hyper_key;
 extern EMACS_INT dos_super_key;
--- a/src/ecrt0.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/ecrt0.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The standard Vax 4.2 Unix crt0.c cannot be used for Emacs
--- a/src/editfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/editfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/emacs.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/emacs.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/epaths.in	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/epaths.in	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* The default search path for Lisp function "load".
    This sets load-path.  */
--- a/src/eval.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/eval.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/fileio.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/fileio.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 
--- a/src/filelock.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/filelock.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/filemode.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/filemode.c	Tue Jul 05 22:22:24 2005 +0000
@@ -13,7 +13,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.  */
 
 #ifdef HAVE_CONFIG_H
--- a/src/firstfile.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/firstfile.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/floatfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/floatfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* ANSI C requires only these float functions:
--- a/src/fns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/fns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 
--- a/src/fontset.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/fontset.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* #define FONTSET_DEBUG */
 
--- a/src/fontset.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/fontset.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
--- a/src/frame.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/frame.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 
--- a/src/frame.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/frame.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Don't multiply include: dispextern.h includes macterm.h which
    includes frame.h some emacs source includes both dispextern.h and
--- a/src/fringe.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/fringe.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/getloadavg.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/getloadavg.c	Tue Jul 05 22:22:24 2005 +0000
@@ -17,7 +17,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.  */
 
 /* Compile-time symbols that this file uses:
--- a/src/getpagesize.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/getpagesize.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef HAVE_GETPAGESIZE
 
--- a/src/gmalloc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/gmalloc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -20,8 +20,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -339,8 +339,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -942,8 +942,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1261,8 +1261,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1506,8 +1506,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1546,7 +1546,8 @@
 
 You should have received a copy of the GNU General Public License
 along with the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.  */
 
 #ifndef	_MALLOC_INTERNAL
 #define	_MALLOC_INTERNAL
@@ -1602,8 +1603,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef	_MALLOC_INTERNAL
 #define _MALLOC_INTERNAL
@@ -1702,8 +1703,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1769,8 +1770,8 @@
 
 You should have received a copy of the GNU Library General Public
 License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
--- a/src/gtkutil.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/gtkutil.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include "config.h"
 
--- a/src/gtkutil.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/gtkutil.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef GTKUTIL_H
 #define GTKUTIL_H
--- a/src/image.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/image.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/indent.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/indent.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/indent.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/indent.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* We introduce new member `tab_offset'.  We need it because of the
    existence of wide-column characters.  There is a case that the
--- a/src/insdel.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/insdel.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/intervals.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/intervals.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* NOTES:
--- a/src/intervals.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/intervals.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "dispextern.h"
 
--- a/src/keyboard.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/keyboard.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/keyboard.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/keyboard.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Length of echobuf field in each KBOARD.  */
 
--- a/src/keymap.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/keymap.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/keymap.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/keymap.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef KEYMAP_H
 #define KEYMAP_H
--- a/src/lastfile.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/lastfile.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* How this works:
--- a/src/lisp.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/lisp.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef EMACS_LISP_H
 #define EMACS_LISP_H
--- a/src/lread.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/lread.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/m/7300.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/7300.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/acorn.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/acorn.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
--- a/src/m/alliant-2800.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/alliant-2800.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/alliant.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/alliant.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/alpha.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/alpha.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/altos.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/altos.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/amdahl.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/amdahl.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
 This file for amdahl_uts created by modifying the template.h
--- a/src/m/amdx86-64.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/amdx86-64.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/apollo.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/apollo.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/arm.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/arm.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
--- a/src/m/att3b.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/att3b.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/aviion.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/aviion.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/celerity.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/celerity.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/clipper.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/clipper.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/cnvrgnt.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/cnvrgnt.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/convex.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/convex.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/cydra5.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/cydra5.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/delta88k.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/delta88k.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/dpx2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/dpx2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/dual.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/dual.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/elxsi.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/elxsi.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/ews4800.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ews4800.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #undef LIB_STANDARD
 #undef C_DEBUG_SWITCH
--- a/src/m/gould-np1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/gould-np1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/gould.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/gould.h	Tue Jul 05 22:22:24 2005 +0000
@@ -21,8 +21,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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/hp800.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/hp800.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/hp9000s300.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/hp9000s300.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/i860.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/i860.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ia64.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ia64.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #define BITS_PER_LONG		64
 #define BITS_PER_EMACS_INT	64
--- a/src/m/ibm370aix.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibm370aix.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "ibmps2-aix.h"
 
--- a/src/m/ibmps2-aix.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibmps2-aix.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrs6000.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibmrs6000.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrt-aix.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibmrt-aix.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibmrt.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibmrt.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ibms390.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ibms390.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/intel386.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/intel386.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/iris4d.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/iris4d.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/irist.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/irist.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/isi-ov.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/isi-ov.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/m68k.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/m68k.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following three symbols give information on
--- a/src/m/macppc.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/macppc.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
--- a/src/m/masscomp.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/masscomp.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mega68.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/mega68.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mg1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/mg1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mips-siemens.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/mips-siemens.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/mips.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/mips.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/news.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/news.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/next.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/next.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Say this machine is a next if not previously defined */
--- a/src/m/nh3000.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/nh3000.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/nh4000.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/nh4000.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/ns16000.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ns16000.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/ns32000.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ns32000.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
--- a/src/m/nu.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/nu.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/orion.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/orion.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/orion105.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/orion105.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/pfa50.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/pfa50.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/plexus.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/plexus.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/powermac.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/powermac.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/powerpcle.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/powerpcle.h	Tue Jul 05 22:22:24 2005 +0000
@@ -15,7 +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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/pyramid.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/pyramid.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sequent-ptx.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sequent-ptx.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sequent.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sequent.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sparc.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sparc.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/sps7.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sps7.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sr2k.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sr2k.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/stride.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/stride.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sun1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sun2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/sun386.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/sun386.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/symmetry.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/symmetry.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988]
  * Modified the sequent.h file for the Sequent Symmetry machine.
--- a/src/m/tad68k.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tad68k.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tahoe.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tahoe.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/targon31.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/targon31.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tek4300.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tek4300.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tekxd88.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tekxd88.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/template.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/template.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tower32.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tower32.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/tower32v3.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/tower32v3.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 
--- a/src/m/ustation.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/ustation.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/vax.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/vax.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/wicat.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/wicat.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/m/windowsnt.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/windowsnt.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
--- a/src/m/xps100.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/m/xps100.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
--- a/src/mac.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/mac.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/macfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/macgui.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macgui.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/macmenu.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macmenu.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/macros.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macros.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/macros.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macros.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Kbd macro currently being executed (a string or vector).  */
--- a/src/macselect.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macselect.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 
--- a/src/macterm.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macterm.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/macterm.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/macterm.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/makefile.w32-in	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/makefile.w32-in	Tue Jul 05 22:22:24 2005 +0000
@@ -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 = emacs
--- a/src/marker.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/marker.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/md5.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/md5.c	Tue Jul 05 22:22:24 2005 +0000
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
--- a/src/md5.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/md5.h	Tue Jul 05 22:22:24 2005 +0000
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef _MD5_H
 #define _MD5_H 1
--- a/src/mem-limits.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/mem-limits.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef MSDOS
 #include <dpmi.h>
--- a/src/minibuf.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/minibuf.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/mktime.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/mktime.c	Tue Jul 05 22:22:24 2005 +0000
@@ -17,7 +17,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.  */
 
 /* Define this to have a standalone program to test this implementation of
--- a/src/msdos.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/msdos.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
--- a/src/msdos.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/msdos.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_MSDOS_H
 #define EMACS_MSDOS_H
--- a/src/prefix-args.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/prefix-args.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Jim Blandy <jimb@occs.cs.oberlin.edu> - September 1992
 
--- a/src/print.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/print.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/process.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/process.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/process.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/process.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* This structure records information about a subprocess
--- a/src/puresize.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/puresize.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
 
--- a/src/ralloc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/ralloc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* NOTES:
 
--- a/src/regex.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/regex.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.	 */
 
 /* TODO:
--- a/src/regex.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/regex.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 #ifndef _REGEX_H
--- a/src/region-cache.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/region-cache.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/region-cache.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/region-cache.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* This code was written by Jim Blandy <jimb@cs.oberlin.edu> to help
--- a/src/s/aix3-1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/aix3-1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/bsd4-1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/bsd4-1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/bsd4-2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/bsd4-2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/bsd4-3.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/bsd4-3.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/cxux.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/cxux.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/cygwin.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/cygwin.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
--- a/src/s/darwin.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/darwin.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/dgux.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/dgux.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/dgux4.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/dgux4.h	Tue Jul 05 22:22:24 2005 +0000
@@ -16,7 +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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file was written by Roderick Schertler <roderick@ibcinc.com>,
    contact me if you have problems with or comments about running Emacs
--- a/src/s/dgux5-4-3.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/dgux5-4-3.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5
    compiler.  You must upgraded to at least gcc-2.5.8.  If you are
--- a/src/s/dgux5-4r2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/dgux5-4r2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include "dgux.h"
 
--- a/src/s/freebsd.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/freebsd.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Get the correct __FreeBSD_version, even if this is before that was
    defined. */
--- a/src/s/gnu-linux.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/gnu-linux.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file was put together by Michael K. Johnson and Rik Faith.  */
 
--- a/src/s/gnu.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/gnu.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Get most of the stuff from bsd4.3 */
--- a/src/s/hpux.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/hpux.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /*
--- a/src/s/iris3-5.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/iris3-5.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/iris3-6.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/iris3-6.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/irix3-3.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/irix3-3.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/lynxos.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/lynxos.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* LynxOS is almost a bsd 4.2 system */
 #include "s/bsd4-2.h"
--- a/src/s/ms-w32.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/ms-w32.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *      Define symbols to identify the version of Unix this is.
--- a/src/s/msdos.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/msdos.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
--- a/src/s/newsos5.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/newsos5.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Use the SysVr4 file for at least base configuration. */
 
--- a/src/s/nextstep.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/nextstep.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "bsd4-3.h"
 
--- a/src/s/ptx.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/ptx.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file was written by Bill Burton <billb@progress.com>.  Parts were
    adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57
--- a/src/s/riscix1-1.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/riscix1-1.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define  RISCiX_1_1	1
--- a/src/s/riscix12.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/riscix12.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #define  RISCiX_1_2	1
--- a/src/s/rtu.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/rtu.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/sco4.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/sco4.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Ian Lance Taylor, ian@cygnus.com.  */
 
--- a/src/s/sco5.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/sco5.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Contributed by Mark Diekhans <markd@grizzly.com>.  */
 
--- a/src/s/template.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/template.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/umax.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/umax.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/unipl5-2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/unipl5-2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/usg5-0.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/usg5-0.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/usg5-2-2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/usg5-2-2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/usg5-2.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/usg5-2.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/usg5-3.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/usg5-3.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /*
--- a/src/s/usg5-4.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/usg5-4.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This file written by James Van Artsdalen of Dell Computer Corporation.
  * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
--- a/src/s/vms.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/vms.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/xenix.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/s/xenix.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/scroll.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/scroll.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/search.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/search.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/sheap.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/sheap.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/sound.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/sound.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by Gerd Moellmann <gerd@gnu.org>.  Tested with Luigi's
    driver on FreeBSD 2.2.7 with a SoundBlaster 16.  */
--- a/src/strftime.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/strftime.c	Tue Jul 05 22:22:24 2005 +0000
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
--- a/src/sunfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/sunfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -25,8 +25,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.  */
 
 /* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
 Original ideas by David Kastan and Eric Negaard, SRI International
--- a/src/syntax.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/syntax.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 #include <config.h>
--- a/src/syntax.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/syntax.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 extern Lisp_Object Qsyntax_table_p;
--- a/src/sysdep.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/sysdep.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/src/sysselect.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/sysselect.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_SYS_SELECT_H
 #if defined (DARWIN) || defined (MAC_OSX)
--- a/src/syssignal.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/syssignal.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 extern void init_signals P_ ((void));
 
--- a/src/systime.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/systime.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_SYSTIME_H
 #define EMACS_SYSTIME_H
--- a/src/systty.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/systty.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_TERMIOS
 #define HAVE_TCATTR
--- a/src/syswait.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/syswait.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Define the structure that the wait system call stores.
    On many systems, there is a structure defined for this.
--- a/src/term.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/term.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* New redisplay, TTY faces by Gerd Moellmann <gerd@gnu.org>.  */
 
--- a/src/termcap.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/termcap.c	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
--- a/src/termchar.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/termchar.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Each termcap frame points to its own struct tty_output object in
    the output_data.tty field.  The tty_output structure contains the
--- a/src/termhooks.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/termhooks.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Miscellanea.   */
--- a/src/terminfo.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/terminfo.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include "lisp.h"
--- a/src/termopts.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/termopts.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Nonzero means flash the screen instead of ringing the bell.  */
--- a/src/textprop.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/textprop.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include "lisp.h"
--- a/src/tparam.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/tparam.c	Tue Jul 05 22:22:24 2005 +0000
@@ -13,8 +13,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
--- a/src/uaf.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/uaf.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
  * User Authorization File record formats
--- a/src/undo.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/undo.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/unexaix.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexaix.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexalpha.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexalpha.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #include <config.h>
--- a/src/unexapollo.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexapollo.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by Leonard N. Zubkoff.  */
 
--- a/src/unexconvex.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexconvex.c	Tue Jul 05 22:22:24 2005 +0000
@@ -23,8 +23,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.  */
 
 
 /* modified for C-1 arch by jthomp@convex 871103 */
--- a/src/unexcw.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexcw.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <lisp.h>
--- a/src/unexec.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexec.c	Tue Jul 05 22:22:24 2005 +0000
@@ -14,8 +14,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.  */
 
 
 /*
--- a/src/unexelf.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexelf.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexenix.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexenix.c	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.  */
 
 
 
--- a/src/unexmacosx.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexmacosx.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Andrew Choi (akochoi@mac.com).  */
 
--- a/src/unexmips.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexmips.c	Tue Jul 05 22:22:24 2005 +0000
@@ -22,8 +22,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.  */
 
 
 #include <config.h>
--- a/src/unexnext.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexnext.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 #undef __STRICT_BSD__
--- a/src/unexsni.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexsni.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexsunos4.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexsunos4.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Viktor Dukhovni.  */
 /*
--- a/src/unexw32.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/unexw32.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         8-12-94
 */
--- a/src/vm-limit.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/vm-limit.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifdef emacs
 #include <config.h>
--- a/src/w16select.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w16select.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* These functions work by using WinOldAp interface.  WinOldAp
    (WINOLDAP.MOD) is a Microsoft Windows extension supporting
--- a/src/w32.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         7-29-94
 */
--- a/src/w32.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* File descriptor set emulation.  */
--- a/src/w32bdf.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32bdf.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Based heavily on code by H. Miyashita for Meadow (a descendant of
    MULE for W32). */
--- a/src/w32bdf.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32bdf.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Based heavily on code by H. Miyashita for Meadow (a descendant of
    MULE for W32). */
--- a/src/w32console.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32console.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Tim Fleehart (apollo@online.com)		1-17-92
    Geoff Voelker (voelker@cs.washington.edu)	9-12-93
--- a/src/w32fns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32fns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* Added by Kevin Gallo */
 
--- a/src/w32gui.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32gui.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_W32GUI_H
 #define EMACS_W32GUI_H
--- a/src/w32heap.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32heap.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
--- a/src/w32heap.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32heap.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
--- a/src/w32inevt.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32inevt.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Drew Bliss                   01-Oct-93
      Adapted from ntkbd.c by Tim Fleehart
--- a/src/w32inevt.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32inevt.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_W32INEVT_H
 #define EMACS_W32INEVT_H
--- a/src/w32menu.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32menu.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/w32proc.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32proc.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
    Drew Bliss                   Oct 14, 1993
      Adapted from alarm.c by Tim Fleehart
--- a/src/w32reg.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32reg.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by Kevin Gallo */
 
--- a/src/w32select.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32select.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by Kevin Gallo, Benjamin Riefenstahl */
 
--- a/src/w32term.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32term.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/w32term.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32term.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Added by Kevin Gallo */
 
--- a/src/w32xfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/w32xfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <signal.h>
--- a/src/widget.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/widget.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/widget.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/widget.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/widgetprv.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/widgetprv.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/window.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/window.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/window.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/window.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #ifndef WINDOW_H_INCLUDED
 #define WINDOW_H_INCLUDED
--- a/src/xdisp.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xdisp.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>.
 
--- a/src/xfaces.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xfaces.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* New face implementation by Gerd Moellmann <gerd@gnu.org>.  */
 
--- a/src/xfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 #include <stdio.h>
--- a/src/xmenu.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xmenu.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* X pop-up deck-of-cards menu facility for GNU Emacs.
  *
--- a/src/xrdb.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xrdb.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Written by jla, 4/90 */
 
--- a/src/xselect.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xselect.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 
 /* Rewritten by jwz */
--- a/src/xsmfns.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xsmfns.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <config.h>
 
--- a/src/xterm.c	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xterm.c	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 /* New display code by Gerd Moellmann <gerd@gnu.org>.  */
 /* Xt features made by Fred Pierresteguy.  */
--- a/src/xterm.h	Tue Jul 05 22:12:55 2005 +0000
+++ b/src/xterm.h	Tue Jul 05 22:22:24 2005 +0000
@@ -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.  */
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
--- a/update-subdirs	Tue Jul 05 22:12:55 2005 +0000
+++ b/update-subdirs	Tue Jul 05 22:22:24 2005 +0000
@@ -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.
 
 cd $1
 for file in *; do
--- a/vms/make-mms-derivative.el	Tue Jul 05 22:12:55 2005 +0000
+++ b/vms/make-mms-derivative.el	Tue Jul 05 22:22:24 2005 +0000
@@ -19,8 +19,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.
 
 ;;; Commentary: