summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2005-05-23 19:57:22 +0000
committerMarius Vollmer <mvo@zagadka.de>2005-05-23 19:57:22 +0000
commit92205699d01f918a0f8808d8cbbe55ba2568f058 (patch)
tree7893aa8fe5d7200a3ba94f6486100de9c4684f0b
parent5ae1bd9109070f0233b7839b6a2b7c09becd49b0 (diff)
The FSF has a new address.
-rw-r--r--Makefile.am4
-rw-r--r--am/Makefile.am4
-rw-r--r--am/maintainer-dirs4
-rw-r--r--am/pre-inst-guile4
-rwxr-xr-xbenchmark-suite/guile-benchmark4
-rw-r--r--benchmark-suite/lib.scm4
-rw-r--r--configure.in4
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/example-smob/image-type.c4
-rw-r--r--doc/example-smob/myguile.c4
-rw-r--r--doc/goops/Makefile.am4
-rw-r--r--doc/groupings.alist4
-rw-r--r--doc/maint/docstring.el4
-rw-r--r--doc/oldfmt.c4
-rw-r--r--doc/r5rs/Makefile.am4
-rw-r--r--doc/ref/Makefile.am4
-rw-r--r--doc/ref/fdl.texi2
-rw-r--r--doc/tutorial/Makefile.am4
-rw-r--r--emacs/Makefile.am38
-rw-r--r--emacs/gds-client.scm726
-rw-r--r--emacs/gds-server.scm98
-rw-r--r--emacs/gds.el1626
-rw-r--r--emacs/gud-guile.el4
-rw-r--r--emacs/guile-c.el4
-rw-r--r--emacs/guile-emacs.scm4
-rw-r--r--emacs/guile-scheme.el4
-rw-r--r--emacs/guile.el4
-rw-r--r--emacs/multistring.el4
-rw-r--r--emacs/patch.el4
-rw-r--r--emacs/ppexpand.el4
-rw-r--r--emacs/update-changelog.el4
-rw-r--r--examples/Makefile.am4
-rw-r--r--examples/box-dynamic-module/Makefile.am4
-rw-r--r--examples/box-dynamic-module/box.c4
-rw-r--r--examples/box-dynamic/Makefile.am4
-rw-r--r--examples/box-dynamic/box.c4
-rw-r--r--examples/box-module/Makefile.am4
-rw-r--r--examples/box-module/box.c4
-rw-r--r--examples/box/Makefile.am4
-rw-r--r--examples/box/box.c4
-rw-r--r--examples/compat/compat.h4
-rw-r--r--examples/modules/Makefile.am4
-rw-r--r--examples/safe/Makefile.am4
-rw-r--r--examples/scripts/Makefile.am4
-rw-r--r--guile-config/Makefile.am4
-rw-r--r--guile-config/guile-config.in2
-rw-r--r--guile-config/guile.m42
-rw-r--r--guile-config/qthreads.m44
-rw-r--r--guile-readline/Makefile.am4
-rw-r--r--guile-readline/ice-9/Makefile.am4
-rw-r--r--guile-readline/ice-9/readline.scm4
-rw-r--r--guile-readline/readline.c4
-rw-r--r--guile-readline/readline.h4
-rw-r--r--guile-tools.in4
-rw-r--r--ice-9/Makefile.am4
-rw-r--r--ice-9/and-let-star.scm2
-rw-r--r--ice-9/arrays.scm4
-rw-r--r--ice-9/boot-9.scm2
-rw-r--r--ice-9/buffered-input.scm2
-rw-r--r--ice-9/calling.scm2
-rw-r--r--ice-9/channel.scm2
-rw-r--r--ice-9/common-list.scm2
-rw-r--r--ice-9/debug.scm2
-rw-r--r--ice-9/debugger.scm2
-rw-r--r--ice-9/debugger/Makefile.am4
-rw-r--r--ice-9/debugger/behaviour.scm353
-rw-r--r--ice-9/debugger/breakpoints.scm215
-rw-r--r--ice-9/debugger/breakpoints/Makefile.am28
-rw-r--r--ice-9/debugger/breakpoints/procedural.scm103
-rw-r--r--ice-9/debugger/breakpoints/range.scm192
-rw-r--r--ice-9/debugger/breakpoints/source.scm244
-rw-r--r--ice-9/debugger/command-loop.scm2
-rw-r--r--ice-9/debugger/commands.scm2
-rw-r--r--ice-9/debugger/state.scm2
-rw-r--r--ice-9/debugger/trap-hooks.scm320
-rw-r--r--ice-9/debugger/trc.scm2
-rw-r--r--ice-9/deprecated.scm2
-rw-r--r--ice-9/documentation.scm2
-rw-r--r--ice-9/emacs.scm2
-rw-r--r--ice-9/expect.scm2
-rw-r--r--ice-9/ftw.scm2
-rw-r--r--ice-9/gap-buffer.scm2
-rw-r--r--ice-9/getopt-long.scm2
-rw-r--r--ice-9/hcons.scm2
-rw-r--r--ice-9/history.scm2
-rw-r--r--ice-9/lineio.scm2
-rw-r--r--ice-9/list.scm2
-rw-r--r--ice-9/ls.scm2
-rw-r--r--ice-9/mapping.scm2
-rw-r--r--ice-9/match.scm2
-rw-r--r--ice-9/networking.scm2
-rw-r--r--ice-9/null.scm2
-rw-r--r--ice-9/occam-channel.scm2
-rw-r--r--ice-9/optargs.scm2
-rw-r--r--ice-9/poe.scm2
-rw-r--r--ice-9/popen.scm2
-rw-r--r--ice-9/posix.scm2
-rw-r--r--ice-9/pretty-print.scm2
-rw-r--r--ice-9/psyntax.ss2
-rw-r--r--ice-9/q.scm2
-rw-r--r--ice-9/r4rs.scm2
-rw-r--r--ice-9/r5rs.scm2
-rw-r--r--ice-9/rdelim.scm2
-rw-r--r--ice-9/receive.scm2
-rw-r--r--ice-9/regex.scm2
-rw-r--r--ice-9/runq.scm2
-rw-r--r--ice-9/rw.scm2
-rw-r--r--ice-9/safe-r5rs.scm2
-rw-r--r--ice-9/safe.scm2
-rw-r--r--ice-9/serialize.scm2
-rw-r--r--ice-9/session.scm2
-rw-r--r--ice-9/slib.scm2
-rw-r--r--ice-9/stack-catch.scm2
-rw-r--r--ice-9/streams.scm2
-rw-r--r--ice-9/string-fun.scm2
-rw-r--r--ice-9/syncase.scm2
-rw-r--r--ice-9/test.scm2
-rw-r--r--ice-9/threads.scm2
-rw-r--r--ice-9/time.scm2
-rw-r--r--ice-9/weak-vector.scm2
-rw-r--r--lang/Makefile.am4
-rw-r--r--lang/elisp/Makefile.am4
-rw-r--r--lang/elisp/internals/Makefile.am4
-rw-r--r--lang/elisp/primitives/Makefile.am4
-rw-r--r--libguile-ltdl/Makefile.am4
-rw-r--r--libguile-ltdl/guile-ltdl.c4
-rw-r--r--libguile-ltdl/guile-ltdl.h4
-rw-r--r--libguile-ltdl/raw-ltdl.c4
-rw-r--r--libguile-ltdl/raw-ltdl.h4
-rw-r--r--libguile-ltdl/upstream/Makefile.am4
-rw-r--r--libguile-ltdl/upstream/ltdl.c4
-rw-r--r--libguile-ltdl/upstream/ltdl.h4
-rw-r--r--libguile.h4
-rw-r--r--libguile/Makefile.am4
-rw-r--r--libguile/__scm.h4
-rw-r--r--libguile/_scm.h4
-rw-r--r--libguile/alist.c2
-rw-r--r--libguile/alist.h2
-rw-r--r--libguile/arbiters.c2
-rw-r--r--libguile/arbiters.h2
-rw-r--r--libguile/async.c2
-rw-r--r--libguile/async.h2
-rw-r--r--libguile/backtrace.c2
-rw-r--r--libguile/backtrace.h2
-rw-r--r--libguile/boolean.c2
-rw-r--r--libguile/boolean.h2
-rw-r--r--libguile/chars.c2
-rw-r--r--libguile/chars.h2
-rw-r--r--libguile/continuations.c2
-rw-r--r--libguile/continuations.h2
-rw-r--r--libguile/convert.c2
-rw-r--r--libguile/convert.h2
-rw-r--r--libguile/coop-defs.h2
-rw-r--r--libguile/coop-pthreads.c2
-rw-r--r--libguile/coop-pthreads.h2
-rw-r--r--libguile/coop-threads.h2
-rw-r--r--libguile/coop.c4
-rw-r--r--libguile/debug-malloc.c2
-rw-r--r--libguile/debug-malloc.h2
-rw-r--r--libguile/debug.c2
-rw-r--r--libguile/debug.h2
-rw-r--r--libguile/deprecated.c2
-rw-r--r--libguile/deprecated.h2
-rw-r--r--libguile/deprecation.c2
-rw-r--r--libguile/deprecation.h2
-rw-r--r--libguile/discouraged.c2
-rw-r--r--libguile/discouraged.h2
-rw-r--r--libguile/dynl.c2
-rw-r--r--libguile/dynl.h2
-rw-r--r--libguile/dynwind.c2
-rw-r--r--libguile/dynwind.h2
-rw-r--r--libguile/environments.c2
-rw-r--r--libguile/environments.h2
-rw-r--r--libguile/eq.c2
-rw-r--r--libguile/eq.h2
-rw-r--r--libguile/error.c2
-rw-r--r--libguile/error.h2
-rw-r--r--libguile/eval.c2
-rw-r--r--libguile/eval.h2
-rw-r--r--libguile/evalext.c2
-rw-r--r--libguile/evalext.h2
-rw-r--r--libguile/extensions.c2
-rw-r--r--libguile/extensions.h2
-rw-r--r--libguile/feature.c2
-rw-r--r--libguile/feature.h2
-rw-r--r--libguile/filesys.c2
-rw-r--r--libguile/filesys.h2
-rw-r--r--libguile/fluids.c2
-rw-r--r--libguile/fluids.h2
-rw-r--r--libguile/fports.c2
-rw-r--r--libguile/fports.h2
-rw-r--r--libguile/futures.c2
-rw-r--r--libguile/futures.h2
-rw-r--r--libguile/gc-card.c2
-rw-r--r--libguile/gc-freelist.c2
-rw-r--r--libguile/gc-malloc.c2
-rw-r--r--libguile/gc-mark.c2
-rw-r--r--libguile/gc-segment.c2
-rw-r--r--libguile/gc.c2
-rw-r--r--libguile/gc.h2
-rw-r--r--libguile/gdb_interface.h2
-rw-r--r--libguile/gdbint.c2
-rw-r--r--libguile/gdbint.h2
-rw-r--r--libguile/gettext.h2
-rw-r--r--libguile/gh.h2
-rw-r--r--libguile/gh_data.c2
-rw-r--r--libguile/gh_eval.c2
-rw-r--r--libguile/gh_funcs.c2
-rw-r--r--libguile/gh_init.c2
-rw-r--r--libguile/gh_io.c2
-rw-r--r--libguile/gh_list.c2
-rw-r--r--libguile/gh_predicates.c2
-rw-r--r--libguile/goops.c2
-rw-r--r--libguile/goops.h2
-rw-r--r--libguile/gsubr.c2
-rw-r--r--libguile/gsubr.h2
-rw-r--r--libguile/guardians.c2
-rw-r--r--libguile/guardians.h2
-rwxr-xr-xlibguile/guile-doc-snarf.in4
-rw-r--r--libguile/guile-func-name-check.in4
-rwxr-xr-xlibguile/guile-snarf-docs.in4
-rw-r--r--libguile/guile-snarf.awk.in4
-rw-r--r--libguile/guile-snarf.in4
-rw-r--r--libguile/guile.c2
-rw-r--r--libguile/hash.c2
-rw-r--r--libguile/hash.h2
-rw-r--r--libguile/hashtab.c2
-rw-r--r--libguile/hashtab.h2
-rw-r--r--libguile/hooks.c2
-rw-r--r--libguile/hooks.h2
-rw-r--r--libguile/i18n.c2
-rw-r--r--libguile/i18n.h2
-rw-r--r--libguile/init.c2
-rw-r--r--libguile/init.h2
-rw-r--r--libguile/inline.c2
-rw-r--r--libguile/inline.h2
-rw-r--r--libguile/ioext.c2
-rw-r--r--libguile/ioext.h2
-rw-r--r--libguile/iselect.h2
-rw-r--r--libguile/keywords.c2
-rw-r--r--libguile/keywords.h2
-rw-r--r--libguile/lang.c2
-rw-r--r--libguile/lang.h2
-rw-r--r--libguile/list.c2
-rw-r--r--libguile/list.h2
-rw-r--r--libguile/load.c2
-rw-r--r--libguile/load.h2
-rw-r--r--libguile/macros.c2
-rw-r--r--libguile/macros.h2
-rw-r--r--libguile/mallocs.c2
-rw-r--r--libguile/mallocs.h2
-rw-r--r--libguile/mkstemp.c4
-rw-r--r--libguile/modules.c2
-rw-r--r--libguile/modules.h2
-rw-r--r--libguile/net_db.c2
-rw-r--r--libguile/net_db.h2
-rw-r--r--libguile/null-threads.c2
-rw-r--r--libguile/null-threads.h2
-rw-r--r--libguile/numbers.c2
-rw-r--r--libguile/numbers.h2
-rw-r--r--libguile/objects.c2
-rw-r--r--libguile/objects.h2
-rw-r--r--libguile/objprop.c2
-rw-r--r--libguile/objprop.h2
-rw-r--r--libguile/options.c2
-rw-r--r--libguile/options.h2
-rw-r--r--libguile/pairs.c2
-rw-r--r--libguile/pairs.h2
-rw-r--r--libguile/ports.c2
-rw-r--r--libguile/ports.h2
-rw-r--r--libguile/posix.c2
-rw-r--r--libguile/posix.h2
-rw-r--r--libguile/print.c2
-rw-r--r--libguile/print.h2
-rw-r--r--libguile/procprop.c2
-rw-r--r--libguile/procprop.h2
-rw-r--r--libguile/procs.c2
-rw-r--r--libguile/procs.h2
-rw-r--r--libguile/properties.c2
-rw-r--r--libguile/properties.h2
-rw-r--r--libguile/pthread-threads.h2
-rw-r--r--libguile/putenv.c2
-rw-r--r--libguile/ramap.c2
-rw-r--r--libguile/ramap.h2
-rw-r--r--libguile/random.c2
-rw-r--r--libguile/random.h2
-rw-r--r--libguile/rdelim.c2
-rw-r--r--libguile/rdelim.h2
-rw-r--r--libguile/read.c2
-rw-r--r--libguile/read.h2
-rw-r--r--libguile/regex-posix.c2
-rw-r--r--libguile/regex-posix.h2
-rw-r--r--libguile/root.c2
-rw-r--r--libguile/root.h2
-rw-r--r--libguile/rw.c2
-rw-r--r--libguile/rw.h2
-rw-r--r--libguile/scmconfig.h.top2
-rw-r--r--libguile/scmsigs.c2
-rw-r--r--libguile/scmsigs.h2
-rw-r--r--libguile/script.c2
-rw-r--r--libguile/script.h2
-rw-r--r--libguile/simpos.c2
-rw-r--r--libguile/simpos.h2
-rw-r--r--libguile/smob.c2
-rw-r--r--libguile/smob.h2
-rw-r--r--libguile/snarf.h2
-rw-r--r--libguile/socket.c2
-rw-r--r--libguile/socket.h2
-rw-r--r--libguile/sort.c2
-rw-r--r--libguile/sort.h2
-rw-r--r--libguile/srcprop.c2
-rw-r--r--libguile/srcprop.h2
-rw-r--r--libguile/srfi-13.c2
-rw-r--r--libguile/srfi-13.h2
-rw-r--r--libguile/srfi-14.c2
-rw-r--r--libguile/srfi-14.h2
-rw-r--r--libguile/srfi-4.c2
-rw-r--r--libguile/srfi-4.h2
-rw-r--r--libguile/stackchk.c2
-rw-r--r--libguile/stackchk.h2
-rw-r--r--libguile/stacks.c2
-rw-r--r--libguile/stacks.h2
-rw-r--r--libguile/stime.c2
-rw-r--r--libguile/stime.h2
-rw-r--r--libguile/strerror.c2
-rw-r--r--libguile/strings.c2
-rw-r--r--libguile/strings.h2
-rw-r--r--libguile/strorder.c2
-rw-r--r--libguile/strorder.h2
-rw-r--r--libguile/strports.c2
-rw-r--r--libguile/strports.h2
-rw-r--r--libguile/struct.c2
-rw-r--r--libguile/struct.h2
-rw-r--r--libguile/symbols.c2
-rw-r--r--libguile/symbols.h2
-rw-r--r--libguile/tags.h2
-rw-r--r--libguile/threads.c2
-rw-r--r--libguile/threads.h2
-rw-r--r--libguile/throw.c2
-rw-r--r--libguile/throw.h2
-rw-r--r--libguile/unif.c2
-rw-r--r--libguile/unif.h2
-rw-r--r--libguile/validate.h2
-rw-r--r--libguile/values.c2
-rw-r--r--libguile/values.h2
-rw-r--r--libguile/variable.c2
-rw-r--r--libguile/variable.h2
-rw-r--r--libguile/vectors.c2
-rw-r--r--libguile/vectors.h2
-rw-r--r--libguile/version.c2
-rw-r--r--libguile/version.h.in2
-rw-r--r--libguile/vports.c2
-rw-r--r--libguile/vports.h2
-rw-r--r--libguile/weaks.c4
-rw-r--r--libguile/weaks.h2
-rw-r--r--libguile/win32-dirent.c2
-rw-r--r--libguile/win32-dirent.h2
-rw-r--r--libguile/win32-socket.c2
-rw-r--r--libguile/win32-socket.h2
-rw-r--r--libguile/win32-uname.c2
-rw-r--r--libguile/win32-uname.h2
-rw-r--r--oop/Makefile.am4
-rw-r--r--oop/goops.scm2
-rw-r--r--oop/goops/Makefile.am4
-rw-r--r--oop/goops/accessors.scm4
-rw-r--r--oop/goops/active-slot.scm2
-rw-r--r--oop/goops/compile.scm2
-rw-r--r--oop/goops/composite-slot.scm2
-rw-r--r--oop/goops/describe.scm2
-rw-r--r--oop/goops/dispatch.scm2
-rw-r--r--oop/goops/internal.scm2
-rw-r--r--oop/goops/old-define-method.scm2
-rw-r--r--oop/goops/save.scm2
-rw-r--r--oop/goops/simple.scm2
-rw-r--r--oop/goops/stklos.scm2
-rw-r--r--oop/goops/util.scm2
-rw-r--r--pre-inst-guile-env.in2
-rw-r--r--pre-inst-guile.in4
-rw-r--r--qt/Makefile.am4
-rw-r--r--qt/md/Makefile.am4
-rw-r--r--qt/time/Makefile.am4
-rw-r--r--scripts/Makefile.am4
-rwxr-xr-xscripts/PROGRAM4
-rwxr-xr-xscripts/api-diff4
-rwxr-xr-xscripts/autofrisk4
-rwxr-xr-xscripts/display-commentary4
-rwxr-xr-xscripts/doc-snarf4
-rwxr-xr-xscripts/frisk4
-rwxr-xr-xscripts/generate-autoload4
-rwxr-xr-xscripts/lint4
-rwxr-xr-xscripts/punify4
-rwxr-xr-xscripts/read-rfc8224
-rwxr-xr-xscripts/read-scheme-source4
-rwxr-xr-xscripts/read-text-outline4
-rwxr-xr-xscripts/scan-api4
-rwxr-xr-xscripts/snarf-check-and-output-texi4
-rwxr-xr-xscripts/snarf-guile-m4-docs4
-rwxr-xr-xscripts/summarize-guile-TODO4
-rwxr-xr-xscripts/use2dot4
-rw-r--r--srfi/Makefile.am4
-rw-r--r--srfi/srfi-1.c2
-rw-r--r--srfi/srfi-1.h2
-rw-r--r--srfi/srfi-1.scm2
-rw-r--r--srfi/srfi-10.scm2
-rw-r--r--srfi/srfi-11.scm2
-rw-r--r--srfi/srfi-13.c2
-rw-r--r--srfi/srfi-13.h2
-rw-r--r--srfi/srfi-13.scm2
-rw-r--r--srfi/srfi-14.c2
-rw-r--r--srfi/srfi-14.h2
-rw-r--r--srfi/srfi-14.scm2
-rw-r--r--srfi/srfi-16.scm2
-rw-r--r--srfi/srfi-17.scm2
-rw-r--r--srfi/srfi-19.scm2
-rw-r--r--srfi/srfi-2.scm2
-rw-r--r--srfi/srfi-26.scm2
-rw-r--r--srfi/srfi-31.scm2
-rw-r--r--srfi/srfi-34.scm2
-rw-r--r--srfi/srfi-39.scm4
-rw-r--r--srfi/srfi-4.c2
-rw-r--r--srfi/srfi-4.h2
-rw-r--r--srfi/srfi-4.scm2
-rw-r--r--srfi/srfi-6.scm2
-rw-r--r--srfi/srfi-60.c2
-rw-r--r--srfi/srfi-60.h2
-rw-r--r--srfi/srfi-60.scm2
-rw-r--r--srfi/srfi-8.scm2
-rw-r--r--srfi/srfi-9.scm2
-rw-r--r--test-suite/Makefile.am4
-rwxr-xr-xtest-suite/guile-test4
-rw-r--r--test-suite/lib.scm4
-rw-r--r--test-suite/standalone/test-asmobs-lib.c2
-rw-r--r--test-suite/standalone/test-conversion.c2
-rw-r--r--test-suite/standalone/test-gh.c2
-rw-r--r--test-suite/standalone/test-num2integral.c2
-rw-r--r--test-suite/standalone/test-round.c2
-rw-r--r--test-suite/tests/alist.test2
-rw-r--r--test-suite/tests/and-let-star.test4
-rw-r--r--test-suite/tests/arbiters.test2
-rw-r--r--test-suite/tests/bit-operations.test2
-rw-r--r--test-suite/tests/c-api.test4
-rw-r--r--test-suite/tests/chars.test4
-rw-r--r--test-suite/tests/common-list.test2
-rw-r--r--test-suite/tests/continuations.test4
-rw-r--r--test-suite/tests/dynamic-scope.test4
-rw-r--r--test-suite/tests/elisp.test2
-rw-r--r--test-suite/tests/environments.test2
-rw-r--r--test-suite/tests/eval.test2
-rw-r--r--test-suite/tests/exceptions.test2
-rw-r--r--test-suite/tests/filesys.test2
-rw-r--r--test-suite/tests/format.test4
-rw-r--r--test-suite/tests/fractions.test2
-rw-r--r--test-suite/tests/gc.test2
-rw-r--r--test-suite/tests/getopt-long.test4
-rw-r--r--test-suite/tests/goops.test4
-rw-r--r--test-suite/tests/guardians.test4
-rw-r--r--test-suite/tests/hash.test2
-rw-r--r--test-suite/tests/hooks.test2
-rw-r--r--test-suite/tests/import.test2
-rw-r--r--test-suite/tests/interp.test4
-rw-r--r--test-suite/tests/list.test2
-rw-r--r--test-suite/tests/load.test4
-rw-r--r--test-suite/tests/multilingual.nottest4
-rw-r--r--test-suite/tests/numbers.test2
-rw-r--r--test-suite/tests/optargs.test4
-rw-r--r--test-suite/tests/options.test4
-rw-r--r--test-suite/tests/pairs.test4
-rw-r--r--test-suite/tests/poe.test2
-rw-r--r--test-suite/tests/popen.test2
-rw-r--r--test-suite/tests/ports.test4
-rw-r--r--test-suite/tests/posix.test4
-rw-r--r--test-suite/tests/q.test2
-rw-r--r--test-suite/tests/r4rs.test2
-rw-r--r--test-suite/tests/r5rs_pitfall.test2
-rw-r--r--test-suite/tests/ramap.test2
-rw-r--r--test-suite/tests/receive.test4
-rw-r--r--test-suite/tests/regexp.test4
-rw-r--r--test-suite/tests/slib.test4
-rw-r--r--test-suite/tests/socket.test2
-rw-r--r--test-suite/tests/sort.test4
-rw-r--r--test-suite/tests/srcprop.test2
-rw-r--r--test-suite/tests/srfi-1.test4
-rw-r--r--test-suite/tests/srfi-10.test4
-rw-r--r--test-suite/tests/srfi-11.test4
-rw-r--r--test-suite/tests/srfi-13.test4
-rw-r--r--test-suite/tests/srfi-14.test4
-rw-r--r--test-suite/tests/srfi-17.test4
-rw-r--r--test-suite/tests/srfi-19.test4
-rw-r--r--test-suite/tests/srfi-31.test2
-rw-r--r--test-suite/tests/srfi-34.test4
-rw-r--r--test-suite/tests/srfi-39.test4
-rw-r--r--test-suite/tests/srfi-4.test4
-rw-r--r--test-suite/tests/srfi-6.test4
-rw-r--r--test-suite/tests/srfi-60.test4
-rw-r--r--test-suite/tests/srfi-9.test4
-rw-r--r--test-suite/tests/streams.test4
-rw-r--r--test-suite/tests/strings.test4
-rw-r--r--test-suite/tests/symbols.test4
-rw-r--r--test-suite/tests/syncase.test4
-rw-r--r--test-suite/tests/syntax.test4
-rw-r--r--test-suite/tests/threads.test4
-rw-r--r--test-suite/tests/time.test4
-rw-r--r--test-suite/tests/unif.test2
-rw-r--r--test-suite/tests/vectors.test4
-rw-r--r--test-suite/tests/version.test4
-rw-r--r--test-suite/tests/weaks.test2
506 files changed, 642 insertions, 4585 deletions
diff --git a/Makefile.am b/Makefile.am
index a86cd709a..c2a5d45b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = 1.5
diff --git a/am/Makefile.am b/am/Makefile.am
index f8fd41ae4..1aa2985cd 100644
--- a/am/Makefile.am
+++ b/am/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/am/maintainer-dirs b/am/maintainer-dirs
index 1733ae2d7..f72e857c7 100644
--- a/am/maintainer-dirs
+++ b/am/maintainer-dirs
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
## Commentary:
diff --git a/am/pre-inst-guile b/am/pre-inst-guile
index 2cf240104..7594969a0 100644
--- a/am/pre-inst-guile
+++ b/am/pre-inst-guile
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
## Commentary:
diff --git a/benchmark-suite/guile-benchmark b/benchmark-suite/guile-benchmark
index 58f061749..4d3649dad 100755
--- a/benchmark-suite/guile-benchmark
+++ b/benchmark-suite/guile-benchmark
@@ -19,8 +19,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
;;;; Usage: [guile -e main -s] guile-benchmark [OPTIONS] [BENCHMARK ...]
diff --git a/benchmark-suite/lib.scm b/benchmark-suite/lib.scm
index 45f3d9026..a2c1f879a 100644
--- a/benchmark-suite/lib.scm
+++ b/benchmark-suite/lib.scm
@@ -13,8 +13,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (benchmark-suite lib)
:export (
diff --git a/configure.in b/configure.in
index d21457afb..286ececff 100644
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with GUILE; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
]])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3b05f453a..951916833 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/doc/example-smob/image-type.c b/doc/example-smob/image-type.c
index 1cd0f8bca..5ee14a358 100644
--- a/doc/example-smob/image-type.c
+++ b/doc/example-smob/image-type.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 <stdlib.h>
diff --git a/doc/example-smob/myguile.c b/doc/example-smob/myguile.c
index 95bff27fd..4c95e6f0d 100644
--- a/doc/example-smob/myguile.c
+++ b/doc/example-smob/myguile.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 <libguile.h>
diff --git a/doc/goops/Makefile.am b/doc/goops/Makefile.am
index fcc9c6ae6..6149d156b 100644
--- a/doc/goops/Makefile.am
+++ b/doc/goops/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/doc/groupings.alist b/doc/groupings.alist
index df198631c..31b9a748a 100644
--- a/doc/groupings.alist
+++ b/doc/groupings.alist
@@ -14,8 +14,8 @@
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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:
diff --git a/doc/maint/docstring.el b/doc/maint/docstring.el
index 75f4d45ab..2b5639eb6 100644
--- a/doc/maint/docstring.el
+++ b/doc/maint/docstring.el
@@ -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:
diff --git a/doc/oldfmt.c b/doc/oldfmt.c
index 19fbffcc5..cf9e908eb 100644
--- a/doc/oldfmt.c
+++ b/doc/oldfmt.c
@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/doc/r5rs/Makefile.am b/doc/r5rs/Makefile.am
index 2b3d40a67..b368e0598 100644
--- a/doc/r5rs/Makefile.am
+++ b/doc/r5rs/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 0baf99e4f..04c74e239 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi
index c027a25fd..941a609f4 100644
--- a/doc/ref/fdl.texi
+++ b/doc/ref/fdl.texi
@@ -7,7 +7,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.
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index a1509d096..bf7f5245c 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/emacs/Makefile.am b/emacs/Makefile.am
index bef23935c..e69de29bb 100644
--- a/emacs/Makefile.am
+++ b/emacs/Makefile.am
@@ -1,38 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE 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.
-##
-## GUILE 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 GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 59 Temple Place, Suite
-## 330, Boston, MA 02111-1307 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/emacs
-subpkgdata_DATA = gds-client.scm gds-server.scm
-
-lisp_LISP = gds.el
-
-# Suppress byte compilation for now, but only because I haven't tested
-# it yet, so have no idea whether a byte compiled version would work.
-ELCFILES =
-
-info_TEXINFOS = gds.texi
-
-TEXINFO_TEX = ../doc/ref/texinfo.tex
-
-TAGS_FILES = $(subpkgdata_DATA) $(lisp_LISP)
-EXTRA_DIST = $(subpkgdata_DATA) $(lisp_LISP) gds-tutorial.txt gds-problems.txt
diff --git a/emacs/gds-client.scm b/emacs/gds-client.scm
index c1714a22d..e69de29bb 100644
--- a/emacs/gds-client.scm
+++ b/emacs/gds-client.scm
@@ -1,726 +0,0 @@
-;;;; Guile Debugger UI client
-
-;;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (emacs gds-client)
- #:use-module (ice-9 debugger)
- #:use-module (ice-9 debugger behaviour)
- #:use-module (ice-9 debugger breakpoints)
- #:use-module (ice-9 debugger breakpoints procedural)
- #:use-module (ice-9 debugger breakpoints source)
- #:use-module (ice-9 debugger state)
- #:use-module (ice-9 debugger trap-hooks)
- #:use-module (ice-9 debugger utils)
- #:use-module (ice-9 optargs)
- #:use-module (ice-9 regex)
- #:use-module (ice-9 session)
- #:use-module (ice-9 string-fun)
- #:use-module (ice-9 threads)
- #:export (gds-port-number
- gds-connected?
- gds-connect
- gds-command-loop
- gds-server-died-hook)
- #:no-backtrace)
-
-
-;;;; {Internal Tracing and Debugging}
-
-;; Some of this module's thread and mutex code is quite tricky and
-;; includes `trc' statements to trace out useful information if the
-;; environment variable GDS_TRC is defined.
-(define trc
- (if (getenv "GDS_TRC")
- (let ((port (open-output-file "/home/neil/gds-client.log"))
- (trc-mutex (make-mutex)))
- (lambda args
- (with-mutex trc-mutex
- (write args port)
- (newline port)
- (force-output port))))
- noop))
-
-(define-macro (assert expr)
- `(or ,expr
- (error "Assertion failed" expr)))
-
-
-;;;; {TCP Connection}
-
-;; Communication between this module (running in the application being
-;; debugged) and the GDS server and UI code (running in/under Emacs)
-;; is through a TCP connection. `gds-port-number' is the TCP port
-;; number where the server listens for application connections.
-(define gds-port-number 8333)
-
-;; Once connected, the TCP socket port to the server.
-(define gds-port #f)
-
-;; Public procedure to discover whether there is a GDS connection yet.
-(define (gds-connected?)
- "Return @code{#t} if a UI server connected has been made; else @code{#f}."
- (not (not gds-port)))
-
-;; Public procedure to create the connection to the GDS server.
-(define* (gds-connect name #:optional host)
- "Connect to the GDS server as @var{name}, a string that should be
-sufficient to describe the calling application to the GDS frontend
-user. The optional @var{host} arg specifies the hostname or dotted
-decimal IP address where the UI server is running; default is
-127.0.0.1."
- (if (gds-connected?)
- (error "Already connected to UI server!"))
- ;; Connect to debug server.
- (set! gds-port
- (let ((s (socket PF_INET SOCK_STREAM 0))
- (SOL_TCP 6)
- (TCP_NODELAY 1))
- (setsockopt s SOL_TCP TCP_NODELAY 1)
- (connect s AF_INET (inet-aton (or host "127.0.0.1")) gds-port-number)
- s))
- ;; Set debugger-output-port so that messages written to it are not
- ;; displayed on the application's stdout, but instead accumulated
- ;; for sending to the GDS frontend.
- (set! (debugger-output-port)
- (make-soft-port (vector accumulate-output
- accumulate-output
- #f #f #f #f)
- "w"))
- ;; Announce ourselves to the server.
- (write-form (list 'name name (getpid)))
- (add-trapped-stack-id! 'gds-eval-stack)
- ;; Start the UI read thread.
- (set! ui-read-thread (make-thread ui-read-thread-proc)))
-
-(define accumulated-output '())
-
-(define (accumulate-output obj)
- (set! accumulated-output
- (cons (if (string? obj) obj (make-string 1 obj))
- accumulated-output)))
-
-(define (get-accumulated-output)
- (let ((s (apply string-append (reverse! accumulated-output))))
- (set! accumulated-output '())
- s))
-
-
-;;;; {UI Read Thread}
-
-;; Except when the application enters the debugger, communication with
-;; the GDS server and frontend is managed by a dedicated thread for
-;; this purpose. This design avoids having to modify application code
-;; at the expense of requiring a Guile with threads support.
-(define (ui-read-thread-proc)
- (write-status 'running)
- (let ((eval-thread-needed? #t))
- ;; Start up the default eval thread.
- (make-thread eval-thread 1 (lambda () (not eval-thread-needed?)))
- (with-mutex ui-read-mutex
- (catch 'server-died
- ;; Protected thunk: loop reading either protocol input from
- ;; the server, or an indication (through ui-read-switch-pipe)
- ;; that a thread in the debugger wants to take over the
- ;; interaction with the server.
- (lambda ()
- (let loop ((avail '()))
- (write-note 'startloop)
- (cond ((not gds-port)) ; exit loop
- ((null? avail)
- (write-status 'ready-for-input)
- (loop (without-mutex ui-read-mutex
- (car (select (list gds-port
- (car ui-read-switch-pipe))
- '() '())))))
- (else
- (write-note 'sthg-to-read)
- (let ((port (car avail)))
- (if (eq? port gds-port)
- (handle-instruction #f (read gds-port))
- (begin
- (write-note 'debugger-takeover)
- ;; Notification from debugger that it wants
- ;; to take over. Read the notification
- ;; char.
- (read-char (car ui-read-switch-pipe))
- ;; Wait on ui-read-switch variable - this
- ;; allows the debugger thread to grab the
- ;; mutex.
- (write-note 'cond-wait)
- (signal-condition-variable ui-read-switch)
- (wait-condition-variable ui-read-switch
- ui-read-mutex)))
- ;; Loop.
- (loop '()))))
- (write-note 'loopexited)))
- ;; Catch handler.
- (lambda args #f)))
- ;; Tell the eval thread that it can exit.
- (with-mutex eval-work-mutex
- (set! eval-thread-needed? #f)
- (broadcast-condition-variable eval-work-changed))))
-
-;; It's useful to keep a note of the UI thread's id.
-(define ui-read-thread #f)
-
-;; Mutex used to control which thread is currently reading the TCP
-;; connection to the server/UI.
-(define ui-read-mutex (make-mutex))
-
-;; Condition variable used by threads interested in reading the TCP
-;; connection to signal changes in their state.
-(define ui-read-switch (make-condition-variable))
-
-;; Pipe used by application threads that enter the debugger to tell
-;; the UI read thread that they'd like to take over reading the TCP
-;; connection.
-(define ui-read-switch-pipe (pipe))
-
-
-;;;; {Debugger Integration}
-
-;; When a thread enters the Guile debugger and a GDS connection is
-;; present, the debugger calls `gds-command-loop' instead of entering
-;; its usual command loop.
-(define (gds-command-loop state)
- "Interact with the UI frontend."
- (or (gds-connected?)
- (error "Not connected to UI server."))
- ;; Take over server/UI interaction from the normal UI read thread.
- (with-mutex ui-read-mutex
- (write-char #\x (cdr ui-read-switch-pipe))
- (force-output (cdr ui-read-switch-pipe))
- (write-note 'char-written)
- (wait-condition-variable ui-read-switch ui-read-mutex)
- ;; We now "have the com", as they say on Star Trek.
- (catch #t ; Only expect here 'exit-debugger or 'server-died.
- (lambda ()
- (let loop ((state state))
- ;; Write accumulated debugger output.
- (write-form (list 'output (sans-surrounding-whitespace
- (get-accumulated-output))))
- ;; Write current state to the frontend.
- (if state (write-stack state))
- ;; Tell the frontend that we're waiting for input.
- (write-status 'waiting-for-input)
- ;; Read next instruction, act on it, and loop with updated
- ;; state.
- (loop (handle-instruction state (read gds-port)))))
- (lambda args *unspecified*))
- (write-note 'cond-signal)
- ;; Tell the UI read thread that it can take control again.
- (signal-condition-variable ui-read-switch)))
-
-
-;;;; {General Output to Server/UI}
-
-(define write-form
- (let ((protocol-mutex (make-mutex)))
- (lambda (form)
- ;; Write any form FORM to UI frontend.
- (with-mutex protocol-mutex
- (write form gds-port)
- (newline gds-port)
- (force-output gds-port)))))
-
-(define (write-note note)
- ;; Write a note (for debugging this code) to UI frontend.
- (false-if-exception (write-form `(note ,note))))
-
-(define (write-status status)
- (write-form (list 'current-module
- (format #f "~S" (module-name (current-module)))))
- (write-form (list 'status status)))
-
-
-;;;; {Stack Output to Server/UI}
-
-(define (write-stack state)
- ;; Write Emacs-readable representation of current state to UI
- ;; frontend.
- (let ((frames (stack->emacs-readable (state-stack state)))
- (index (index->emacs-readable (state-index state)))
- (flags (flags->emacs-readable (state-flags state))))
- (if (memq 'backwards (debug-options))
- (write-form (list 'stack
- frames
- index
- flags))
- ;; Calculate (length frames) here because `reverse!' will make
- ;; the original `frames' invalid.
- (let ((nframes (length frames)))
- (write-form (list 'stack
- (reverse! frames)
- (- nframes index 1)
- flags))))))
-
-(define (stack->emacs-readable stack)
- ;; Return Emacs-readable representation of STACK.
- (map (lambda (index)
- (frame->emacs-readable (stack-ref stack index)))
- (iota (min (stack-length stack)
- (cadr (memq 'depth (debug-options)))))))
-
-(define (frame->emacs-readable frame)
- ;; Return Emacs-readable representation of FRAME.
- (if (frame-procedure? frame)
- (list 'application
- (with-output-to-string
- (lambda ()
- (display (if (frame-real? frame) " " "t "))
- (write-frame-short/application frame)))
- (source->emacs-readable (or (frame-source frame)
- (let ((proc (frame-procedure frame)))
- (and proc
- (procedure-source proc))))))
- (list 'evaluation
- (with-output-to-string
- (lambda ()
- (display (if (frame-real? frame) " " "t "))
- (write-frame-short/expression frame)))
- (source->emacs-readable (frame-source frame)))))
-
-(define (source->emacs-readable source)
- ;; Return Emacs-readable representation of the filename, line and
- ;; column source properties of SOURCE.
- (if (and source
- (string? (source-property source 'filename)))
- (list (source-property source 'filename)
- (source-property source 'line)
- (source-property source 'column))
- 'nil))
-
-(define (index->emacs-readable index)
- ;; Return Emacs-readable representation of INDEX (the current stack
- ;; index).
- index)
-
-(define (flags->emacs-readable flags)
- ;; Return Emacs-readable representation of FLAGS passed to
- ;; debug-stack.
- (map (lambda (flag)
- (if (keyword? flag)
- (keyword->symbol flag)
- (format #f "~S" flag)))
- flags))
-
-
-;;;; {Handling GDS Protocol Instructions}
-
-;; Instructions from the server/UI always come through here. If
-;; `state' is non-#f, we are in the debugger; otherwise, not.
-(define (handle-instruction state ins)
- (if (eof-object? ins)
- (server-died)
- (catch #t
- (lambda ()
- (lazy-catch #t
- (lambda ()
- (handle-instruction-1 state ins))
- (lambda (key . args)
- (set! internal-error-stack (make-stack #t))
- (apply throw key args))))
- (lambda (key . args)
- (case key
- ((exit-debugger)
- (apply throw key args))
- (else
- (write-form
- `(eval-results (error . "")
- "GDS Internal Error\n"
- ,(list (with-output-to-string
- (lambda ()
- (write key)
- (display ": ")
- (write args)
- (newline)
- (display-backtrace internal-error-stack
- (current-output-port)))))))))
- state))))
-
-(define (server-died)
- (get-accumulated-output)
- (close-port gds-port)
- (set! gds-port #f)
- (run-hook gds-server-died-hook)
- (throw 'server-died))
-
-(define internal-error-stack #f)
-
-(define gds-server-died-hook (make-hook))
-
-(define (handle-instruction-1 state ins)
- ;; Read the newline that always follows an instruction.
- (read-char gds-port)
- ;; Handle instruction from the UI frontend, and return updated state.
- (case (car ins)
- ((query-modules)
- (write-form (cons 'modules (map module-name (loaded-modules))))
- state)
- ((query-module)
- (let ((name (cadr ins)))
- (write-form `(module ,name
- ,(or (loaded-module-source name) "(no source file)")
- ,@(sort (module-map (lambda (key value)
- (symbol->string key))
- (resolve-module-from-root name))
- string<?))))
- state)
- ((debugger-command)
- (or state (error "Not currently in debugger!"))
- (write-status 'running)
- (let ((name (cadr ins))
- (args (cddr ins)))
- (let ((proc (module-ref the-ice-9-debugger-commands-module name)))
- (if proc
- (apply proc state args)
- (throw 'internal-error proc name args))))
- state)
- ((set-breakpoint)
- (set-breakpoint! (case (cadddr ins)
- ((debug-here) debug-here)
- ((trace-here) trace-here)
- ((trace-subtree) trace-subtree)
- (else
- (lambda ()
- (display "Don't know `")
- (display (cadddr ins))
- (display "' behaviour; doing `debug-here' instead.\n")
- (debug-here))))
- (module-ref (resolve-module-from-root (cadr ins)) (caddr ins)))
- state)
- ((eval)
- (apply (lambda (correlator module port-name line column bpinfo code)
- (with-input-from-string code
- (lambda ()
- (set-port-filename! (current-input-port) port-name)
- (set-port-line! (current-input-port) line)
- (set-port-column! (current-input-port) column)
- (let ((m (and module (resolve-module-from-root module))))
- (catch 'read-error
- (lambda ()
- (let loop ((exprs '()) (x (read)))
- (if (eof-object? x)
- ;; Expressions to be evaluated have all
- ;; been read. Now hand them off to an
- ;; eval-thread for the actual
- ;; evaluation.
- (with-mutex eval-work-mutex
- (trc 'protocol-thread
- "evaluation work available")
- (set! eval-work
- (cons* correlator m (reverse! exprs)))
- (set! eval-work-available #t)
- (broadcast-condition-variable eval-work-changed)
- (wait-condition-variable eval-work-taken
- eval-work-mutex)
- (assert (not eval-work-available))
- (trc 'protocol-thread
- "evaluation work underway"))
- ;; Another complete expression read.
- ;; Set breakpoints in the read code as
- ;; specified by bpinfo, and add it to
- ;; the list.
- (begin
- (install-breakpoints x bpinfo)
- (loop (cons x exprs) (read))))))
- (lambda (key . args)
- (write-form `(eval-results
- ,correlator
- ,(with-output-to-string
- (lambda ()
- (display ";;; Reading expressions")
- (display " to evaluate\n")
- (apply display-error #f
- (current-output-port) args)))
- ("error-in-read")))))))))
- (cdr ins))
- state)
- ((complete)
- (let ((matches (apropos-internal
- (string-append "^" (regexp-quote (cadr ins))))))
- (cond ((null? matches)
- (write-form '(completion-result nil)))
- (else
- ;;(write matches (current-error-port))
- ;;(newline (current-error-port))
- (let ((match
- (let loop ((match (symbol->string (car matches)))
- (matches (cdr matches)))
- ;;(write match (current-error-port))
- ;;(newline (current-error-port))
- ;;(write matches (current-error-port))
- ;;(newline (current-error-port))
- (if (null? matches)
- match
- (if (string-prefix=? match
- (symbol->string (car matches)))
- (loop match (cdr matches))
- (loop (substring match 0
- (- (string-length match) 1))
- matches))))))
- (if (string=? match (cadr ins))
- (write-form `(completion-result
- ,(map symbol->string matches)))
- (write-form `(completion-result
- ,match)))))))
- state)
- ((async-break)
- (let ((thread (car (delq ui-read-thread (all-threads)))))
- (write (cons 'target-thread thread))
- (newline)
- (write (cons 'ui-read-thread ui-read-thread))
- (newline)
- (system-async-mark (lambda ()
- (debug-stack (make-stack #t 3) #:continuable))
- thread))
- state)
- ((interrupt-eval)
- (let ((thread (hash-ref eval-thread-table (cadr ins))))
- (system-async-mark (lambda ()
- (debug-stack (make-stack #t 3) #:continuable))
- thread))
- state)
- (else state)))
-
-(define the-ice-9-debugger-commands-module
- (resolve-module '(ice-9 debugger commands)))
-
-(define (resolve-module-from-root name)
- (save-module-excursion
- (lambda ()
- (set-current-module the-root-module)
- (resolve-module name))))
-
-
-;;;; {Module Browsing}
-
-(define (loaded-module-source module-name)
- ;; Return the file name that (ice-9 boot-9) probably loaded the
- ;; named module from. (The `probably' is because `%load-path' might
- ;; have changed since the module was loaded.)
- (let* ((reverse-name (reverse module-name))
- (name (symbol->string (car reverse-name)))
- (dir-hint-module-name (reverse (cdr reverse-name)))
- (dir-hint (apply string-append
- (map (lambda (elt)
- (string-append (symbol->string elt) "/"))
- dir-hint-module-name))))
- (%search-load-path (in-vicinity dir-hint name))))
-
-(define (loaded-modules)
- ;; Return list of all loaded modules sorted by name.
- (sort (apropos-fold-all (lambda (module acc) (cons module acc)) '())
- (lambda (m1 m2)
- (symlist<? (module-name m1) (module-name m2)))))
-
-(define (symlist<? l1 l2)
- ;; Return #t if symbol list L1 is alphabetically less than L2.
- (cond ((null? l1) #t)
- ((null? l2) #f)
- ((eq? (car l1) (car l2)) (symlist<? (cdr l1) (cdr l2)))
- (else (string<? (symbol->string (car l1)) (symbol->string (car l2))))))
-
-
-;;;; {Source Breakpoint Installation}
-
-(define (install-breakpoints x bpinfo)
- (define (install-recursive x)
- (if (and (list? x) (not (null? x)))
- (begin
- ;; Check source properties of x itself.
- (let* ((infokey (cons (source-property x 'line)
- (source-property x 'column)))
- (bpentry (assoc infokey bpinfo)))
- (if bpentry
- (let ((bp (set-breakpoint! debug-here x x)))
- ;; FIXME: Here should transfer properties from the
- ;; old breakpoint with index (cdr bpentry) to the
- ;; new breakpoint. (Or else provide an alternative
- ;; to set-breakpoint! that reuses the same
- ;; breakpoint.)
- (write-form (list 'breakpoint-set
- (source-property x 'filename)
- (car infokey)
- (cdr infokey)
- (bp-number bp))))))
- ;; Check each of x's elements.
- (for-each install-recursive x))))
- (install-recursive x))
-
-
-;;;; {Evaluation}
-
-;; Evaluation threads are unleashed by two possible triggers. One is
-;; a boolean variable, specific to each thread, that tells the thread
-;; to exit when set to #t. The other is another boolean variable, but
-;; global, indicating that there is an evaluation to perform:
-(define eval-work-available #f)
-
-;; This variable, which is only valid when `eval-work-available' is
-;; #t, holds the evaluation to perform:
-(define eval-work #f)
-
-;; A mutex protects against concurrent access to these variables.
-(define eval-work-mutex (make-mutex))
-
-;; Changes in these variables are signaled by broadcasting the
-;; following condition variable.
-(define eval-work-changed (make-condition-variable))
-
-;; When an evaluation thread takes some work, it tells the main GDS
-;; thread by signaling this condition variable.
-(define eval-work-taken (make-condition-variable))
-
-(define-macro (without-mutex m . body)
- `(dynamic-wind
- (lambda () (unlock-mutex ,m))
- (lambda () (begin ,@body))
- (lambda () (lock-mutex ,m))))
-
-(define next-thread-number
- (let ((count 0))
- (lambda ()
- (set! count (+ count 1))
- count)))
-
-(define eval-thread-table (make-hash-table 3))
-
-(define (eval-thread depth thread-should-exit-thunk)
- ;; Acquire mutex to check trigger variables.
- (with-mutex eval-work-mutex
- (let ((thread-number (next-thread-number)))
- ;; Add this thread to global hash, so we can correlate back to
- ;; this thread from the ID used by the GDS front end.
- (hash-set! eval-thread-table thread-number (current-thread))
- (trc 'eval-thread depth thread-number "entering loop")
- (let loop ()
- ;; Tell the front end this thread is ready.
- (write-form `(thread-status eval ,thread-number ready))
- (cond ((thread-should-exit-thunk)
- ;; Allow thread to exit.
- )
-
- (eval-work-available
- ;; Take a local copy of the work, reset global
- ;; variables, then do the work with mutex released.
- (trc 'eval-thread depth thread-number "starting work")
- (let* ((work eval-work)
- (subthread-needed? #t)
- (correlator (car work)))
- ;; Tell the front end this thread is busy.
- (write-form `(thread-status eval ,thread-number busy ,correlator))
- (set! eval-work-available #f)
- (signal-condition-variable eval-work-taken)
- (without-mutex eval-work-mutex
- ;; Before starting evaluation, create another eval
- ;; thread like this one, so that it can take over
- ;; if another evaluation is requested before this
- ;; one is finished.
- (make-thread eval-thread (+ depth 1)
- (lambda () (not subthread-needed?)))
- ;; Do the evaluation(s).
- (let loop2 ((m (cadr work))
- (exprs (cddr work))
- (results '())
- (n 1))
- (if (null? exprs)
- (write-form `(eval-results ,correlator ,@results))
- (loop2 m
- (cdr exprs)
- (append results (gds-eval (car exprs) m
- (if (and (null? (cdr exprs))
- (= n 1))
- #f n)))
- (+ n 1)))))
- (trc 'eval-thread depth thread-number "work done")
- ;; Tell the subthread that it should now exit.
- (set! subthread-needed? #f)
- (broadcast-condition-variable eval-work-changed)
- ;; Loop for more work for this thread.
- (loop)))
-
- (else
- ;; Wait for something to change, then loop to check
- ;; trigger variables again.
- (trc 'eval-thread depth thread-number "wait")
- (wait-condition-variable eval-work-changed eval-work-mutex)
- (trc 'eval-thread depth thread-number "wait done")
- (loop))))
- (trc 'eval-thread depth thread-number "exiting")
- ;; Tell the front end this thread is ready.
- (write-form `(thread-status eval ,thread-number exiting)))))
-
-(define (gds-eval x m part)
- ;; Consumer to accept possibly multiple values and present them for
- ;; Emacs as a list of strings.
- (define (value-consumer . values)
- (if (unspecified? (car values))
- '()
- (map (lambda (value)
- (with-output-to-string (lambda () (write value))))
- values)))
- ;; Now do evaluation.
- (let ((intro (if part
- (format #f ";;; Evaluating subexpression ~A" part)
- ";;; Evaluating"))
- (value #f))
- (let* ((do-eval (if m
- (lambda ()
- (display intro)
- (display " in module ")
- (write (module-name m))
- (newline)
- (set! value
- (call-with-values (lambda ()
- (start-stack 'gds-eval-stack
- (eval x m)))
- value-consumer)))
- (lambda ()
- (display intro)
- (display " in current module ")
- (write (module-name (current-module)))
- (newline)
- (set! value
- (call-with-values (lambda ()
- (start-stack 'gds-eval-stack
- (primitive-eval x)))
- value-consumer)))))
- (output
- (with-output-to-string
- (lambda ()
- (catch #t
- do-eval
- (lambda (key . args)
- (case key
- ((misc-error signal unbound-variable
- numerical-overflow)
- (apply display-error #f
- (current-output-port) args)
- (set! value '("error-in-evaluation")))
- (else
- (display "EXCEPTION: ")
- (display key)
- (display " ")
- (write args)
- (newline)
- (set! value
- '("unhandled-exception-in-evaluation"))))))))))
- (list output value))))
-
-
-;;; (emacs gds-client) ends here.
diff --git a/emacs/gds-server.scm b/emacs/gds-server.scm
index c472ee359..e69de29bb 100644
--- a/emacs/gds-server.scm
+++ b/emacs/gds-server.scm
@@ -1,98 +0,0 @@
-;;;; Guile Debugger UI server
-
-;;; Copyright (C) 2003 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (emacs gds-server)
- #:use-module (emacs gds-client)
- #:export (run-server))
-
-;; UI is normally via a pipe to Emacs, so make sure to flush output
-;; every time we write.
-(define (write-to-ui form)
- (write form)
- (newline)
- (force-output))
-
-(define (trc . args)
- (write-to-ui (cons '* args)))
-
-(define (with-error->eof proc port)
- (catch #t
- (lambda () (proc port))
- (lambda args the-eof-object)))
-
-(define (run-server . ignored-args)
-
- (let ((server (socket PF_INET SOCK_STREAM 0)))
-
- ;; Initialize server socket.
- (setsockopt server SOL_SOCKET SO_REUSEADDR 1)
- (bind server AF_INET INADDR_ANY gds-port-number)
- (listen server 5)
-
- (let loop ((clients '()) (readable-sockets '()))
-
- (define (do-read port)
- (cond ((eq? port (current-input-port))
- (do-read-from-ui))
- ((eq? port server)
- (accept-new-client))
- (else
- (do-read-from-client port))))
-
- (define (do-read-from-ui)
- (trc "reading from ui")
- (let* ((form (with-error->eof read (current-input-port)))
- (client (assq-ref (map (lambda (port)
- (cons (fileno port) port))
- clients)
- (car form))))
- (with-error->eof read-char (current-input-port))
- (if client
- (begin
- (write (cdr form) client)
- (newline client))
- (trc "client not found")))
- clients)
-
- (define (accept-new-client)
- (cons (car (accept server)) clients))
-
- (define (do-read-from-client port)
- (trc "reading from client")
- (let ((next-char (with-error->eof peek-char port)))
- ;;(trc 'next-char next-char)
- (cond ((eof-object? next-char)
- (write-to-ui (list (fileno port) 'closed))
- (close port)
- (delq port clients))
- ((char=? next-char #\()
- (write-to-ui (cons (fileno port) (with-error->eof read port)))
- clients)
- (else
- (with-error->eof read-char port)
- clients))))
-
- ;;(trc 'clients clients)
- ;;(trc 'readable-sockets readable-sockets)
-
- (if (null? readable-sockets)
- (loop clients (car (select (cons (current-input-port)
- (cons server clients))
- '()
- '())))
- (loop (do-read (car readable-sockets)) (cdr readable-sockets))))))
diff --git a/emacs/gds.el b/emacs/gds.el
index d5f607a32..e69de29bb 100644
--- a/emacs/gds.el
+++ b/emacs/gds.el
@@ -1,1626 +0,0 @@
-;;; gds.el -- frontend for Guile development in Emacs
-
-;;;; Copyright (C) 2003 Free Software Foundation, Inc.
-;;;;
-;;;; This library is free software; you can redistribute it and/or
-;;;; modify it under the terms of the GNU Lesser General Public
-;;;; License as published by the Free Software Foundation; either
-;;;; version 2.1 of the License, or (at your option) any later
-;;;; version.
-;;;;
-;;;; This library 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
-;;;; Lesser General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU Lesser General Public
-;;;; License along with this library; if not, write to the Free
-;;;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-;;;; 02111-1307 USA
-
-
-;;;; Prerequisites.
-
-(require 'widget)
-(require 'wid-edit)
-(require 'scheme)
-(require 'cl)
-(require 'comint)
-(require 'info)
-
-
-;;;; Customization group setup.
-
-(defgroup gds nil
- "Customization options for Guile Emacs frontend."
- :group 'scheme)
-
-
-;;;; Communication with the (emacs gds-server) subprocess.
-
-;; The subprocess object.
-(defvar gds-process nil)
-
-;; Subprocess output goes into the `*GDS Process*' buffer, and
-;; is then read from there one form at a time. `gds-read-cursor' is
-;; the buffer position of the start of the next unread form.
-(defvar gds-read-cursor nil)
-
-;; The guile executable used by the GDS server and captive client
-;; processes.
-(defcustom gds-guile-program "guile"
- "*The guile executable used by GDS, specifically by its server and
-captive client processes."
- :type 'string
- :group 'gds)
-
-(defun gds-start ()
- "Start (or restart, if already running) the GDS subprocess."
- (interactive)
- (gds-kill-captive)
- (if gds-process (gds-shutdown))
- (with-current-buffer (get-buffer-create "*GDS Process*")
- (erase-buffer)
- (setq gds-process
- (let ((process-connection-type nil)) ; use a pipe
- (start-process "gds"
- (current-buffer)
- gds-guile-program
- "-q"
- "--debug"
- "-c"
- "(begin (use-modules (emacs gds-server)) (run-server))"))))
- (setq gds-read-cursor (point-min))
- (set-process-filter gds-process (function gds-filter))
- (set-process-sentinel gds-process (function gds-sentinel))
- (set-process-coding-system gds-process 'latin-1-unix)
- (process-kill-without-query gds-process))
-
-;; Shutdown the subprocess and cleanup all associated data.
-(defun gds-shutdown ()
- "Shut down the GDS subprocess."
- (interactive)
- ;; Reset variables.
- (setq gds-buffers nil)
- ;; Kill the subprocess.
- (condition-case nil
- (progn
- (kill-process gds-process)
- (accept-process-output gds-process 0 200))
- (error))
- (setq gds-process nil))
-
-;; Subprocess output filter: inserts normally into the process buffer,
-;; then tries to reread the output one form at a time and delegates
-;; processing of each form to `gds-handle-input'.
-(defun gds-filter (proc string)
- (with-current-buffer (process-buffer proc)
- (save-excursion
- (goto-char (process-mark proc))
- (insert-before-markers string))
- (goto-char gds-read-cursor)
- (while (let ((form (condition-case nil
- (read (current-buffer))
- (error nil))))
- (if form
- (save-excursion
- (gds-handle-input form)))
- form)
- (setq gds-read-cursor (point)))))
-
-;; Subprocess sentinel: do nothing. (Currently just here to avoid
-;; inserting un-`read'able process status messages into the process
-;; buffer.)
-(defun gds-sentinel (proc event)
- )
-
-;; Send input to the subprocess.
-(defun gds-send (string client)
- (process-send-string gds-process (format "(%S %s)\n" client string))
- (let ((buf (gds-client-ref 'gds-transcript)))
- (if buf
- (with-current-buffer buf
- (goto-char (point-max))
- (let ((inhibit-read-only t))
- (insert (format "tx (%S %s)\n" client string)))))))
-
-
-;;;; Focussing in and out on interaction with a particular client.
-
-;;;; The slight possible problems here are that popping up a client's
-;;;; interaction windows when that client wants attention might
-;;;; interrupt something else that the Emacs user was working on at
-;;;; the time, and that if multiple clients are being debugged at the
-;;;; same time, their popping up of interaction windows might become
-;;;; confusing. For this reason, we allow GDS's behavior to be
-;;;; customized via the variables `gds-focus-in-function' and
-;;;; `gds-focus-out-function'.
-;;;;
-;;;; That said, the default policy, which is probably OK for most
-;;;; users most of the time, is very simple: when a client wants
-;;;; attention, its interaction windows are popped up immediately.
-
-(defun gds-request-focus (client)
- (funcall gds-focus-in-function client))
-
-(defcustom gds-focus-in-function (function gds-focus-in)
- "Function to call when a GDS client program wants user attention.
-The function is called with one argument, the CLIENT in question."
- :type 'function
- :group 'gds)
-
-(defun gds-focus-in (client)
- (gds-display-buffers client))
-
-(defun gds-quit ()
- (interactive)
- (funcall gds-focus-out-function))
-
-(defcustom gds-focus-out-function (function gds-focus-out)
- "Function to call when user quits interacting with a GDS client."
- :type 'function
- :group 'gds)
-
-(defun gds-focus-out ()
- (if (if (gds-client-blocked)
- (y-or-n-p "Client is waiting for input. Quit anyway? ")
- t)
- (bury-buffer (current-buffer))))
-
-
-;;;; Multiple client focus -- an alternative implementation.
-
-;;;; The following code is provided as an alternative example of how a
-;;;; customized GDS could schedule the display of multiple clients
-;;;; that are competing for user attention.
-
-;; - `gds-waiting' holds a list of clients that want attention but
-;; haven't yet got it. A client is added to this list for two
-;; reasons. (1) When it is blocked waiting for user input.
-;; (2) When it first connects to GDS, even if not blocked.
-;;
-;; - `gds-focus-client' holds the client, if any, that currently has
-;; the user's attention. A client can be given the focus if
-;; `gds-focus-client' is nil at the time that the client wants
-;; attention, or if another client relinquishes it. A client can
-;; relinquish the focus in two ways. (1) If the client application
-;; says that it is no longer blocked, and a small time passes without
-;; it becoming blocked again. (2) If the user explicitly `quits'
-;; that client.
-;;
-;; (defvar gds-focus-client nil)
-;; (defvar gds-waiting nil)
-;;
-;; (defun gds-focus-in-alternative (client)
-;; (cond ((eq client gds-focus-client)
-;; ;; CLIENT already has the focus. Display its buffer.
-;; (gds-display-buffers client))
-;; (gds-focus-client
-;; ;; Another client has the focus. Add CLIENT to `gds-waiting'.
-;; (or (memq client gds-waiting)
-;; (setq gds-waiting (append gds-waiting (list client)))))
-;; (t
-;; ;; Give focus to CLIENT and display its buffer.
-;; (setq gds-focus-client client)
-;; (gds-display-buffers client))))
-;;
-;; (defun gds-focus-out-alternative ()
-;; (if (or (car gds-waiting)
-;; (not (gds-client-blocked))
-;; (y-or-n-p
-;; "Client is blocked and no others are waiting. Still quit? "))
-;; (progn
-;; (bury-buffer (current-buffer))
-;; ;; Pass on the focus.
-;; (setq gds-focus-client (car gds-waiting)
-;; gds-waiting (cdr gds-waiting))
-;; ;; If this client is blocked, add it back into the waiting list.
-;; (if (gds-client-blocked)
-;; (gds-request-focus gds-client))
-;; ;; If there is a new focus client, request display for it.
-;; (if gds-focus-client
-;; (gds-request-focus gds-focus-client)))))
-
-
-;;;; GDS protocol dispatch.
-
-;; General dispatch function called by the subprocess filter.
-(defun gds-handle-input (form)
- (let ((client (car form)))
- (or (eq client '*)
- (let* ((proc (cadr form))
- (args (cddr form))
- (buf (gds-client-buffer client proc args)))
- (if buf (gds-handle-client-input buf client proc args))))))
-
-(defun gds-handle-client-input (buf client proc args)
- (with-current-buffer buf
- (with-current-buffer gds-transcript
- (goto-char (point-max))
- (let ((inhibit-read-only t))
- (insert (format "rx %S" (cons client (cons proc args))) "\n")))
-
- (cond (;; (name ...) - Client name.
- (eq proc 'name)
- (setq gds-pid (cadr args))
- (gds-promote-view 'interaction)
- (gds-request-focus client))
-
- (;; (current-module ...) - Current module.
- (eq proc 'current-module)
- (setq gds-current-module (car args)))
-
- (;; (stack ...) - Stack at an error or breakpoint.
- (eq proc 'stack)
- (setq gds-stack args)
- (gds-promote-view 'stack))
-
- (;; (modules ...) - Application's loaded modules.
- (eq proc 'modules)
- (while args
- (or (assoc (car args) gds-modules)
- (setq gds-modules (cons (list (car args)) gds-modules)))
- (setq args (cdr args))))
-
- (;; (output ...) - Last printed output.
- (eq proc 'output)
- (setq gds-output (car args))
- (gds-add-view 'messages))
-
- (;; (status ...) - Application status indication.
- (eq proc 'status)
- (setq gds-status (car args))
- (if (eq gds-status 'running)
- (gds-delete-view 'browser)
- (gds-add-view 'browser))
- (if (eq gds-status 'waiting-for-input)
- (progn
- (gds-promote-view 'stack)
- (gds-update-buffers)
- (gds-request-focus client))
- (setq gds-stack nil)
- (gds-delete-view 'stack)
- (gds-update-buffers-in-a-while)))
-
- (;; (module MODULE ...) - The specified module's bindings.
- (eq proc 'module)
- (let ((minfo (assoc (car args) gds-modules)))
- (if minfo
- (setcdr (cdr minfo) (cdr args)))))
-
- (;; (closed) - Client has gone away.
- (eq proc 'closed)
- (setq gds-status 'closed)
- (gds-update-buffers)
- (setq gds-buffers
- (delq (assq client gds-buffers) gds-buffers)))
-
- (;; (eval-results ...) - Results of evaluation.
- (eq proc 'eval-results)
- (gds-display-results client (car args) (cdr args)))
-
- (;; (completion-result ...) - Available completions.
- (eq proc 'completion-result)
- (setq gds-completion-results (or (car args) t)))
-
- (;; (breakpoint-set FILE LINE COLUMN INFO) - Breakpoint set.
- (eq proc 'breakpoint-set)
- (let ((file (nth 0 args))
- (line (nth 1 args))
- (column (nth 2 args))
- (info (nth 3 args)))
- (with-current-buffer (find-file-noselect file)
- (save-excursion
- (goto-char (point-min))
- (or (zerop line)
- (forward-line line))
- (move-to-column column)
- (let ((os (overlays-at (point))) o)
- (while os
- (if (and (overlay-get (car os) 'gds-breakpoint-info)
- (= (overlay-start (car os)) (point)))
- (progn
- (overlay-put (car os)
- 'gds-breakpoint-info
- info)
- (overlay-put (car os)
- 'before-string
- gds-active-breakpoint-before-string)
- (overlay-put (car os)
- 'after-string
- gds-active-breakpoint-after-string)
- (setq os nil))
- (setq os (cdr os)))))))))
-
- (;; (thread-status THREAD-TYPE THREAD-NUMBER STATUS [CORRELATOR])
- (eq proc 'thread-status)
- (if (eq (car args) 'eval)
- (let ((number (nth 1 args))
- (status (nth 2 args))
- (correlator (nth 3 args)))
- (if (eq status 'busy)
- (progn
- (setq gds-evals-in-progress
- (append gds-evals-in-progress
- (list (cons number correlator))))
- (run-at-time 0.5 nil
- (function gds-display-slow-eval)
- buf number correlator)
- (gds-promote-view 'interaction))
- (let ((existing (assq number gds-evals-in-progress)))
- (if existing
- (setq gds-evals-in-progress
- (delq existing gds-evals-in-progress)))))
- (gds-update-buffers))))
-
- )))
-
-(defun gds-display-slow-eval (buf number correlator)
- (with-current-buffer buf
- (let ((entry (assq number gds-evals-in-progress)))
- (if (and entry
- (eq (cdr entry) correlator))
- (progn
- (gds-promote-view 'interaction)
- (gds-request-focus gds-client))))))
-
-
-;;;; Per-client buffer state.
-
-;; This section contains code that is specific to each Guile client's
-;; buffer but independent of any particular `view'.
-
-;; Alist mapping each client port number to corresponding buffer.
-(defvar gds-buffers nil)
-
-(define-derived-mode gds-mode
- scheme-mode
- "Guile Interaction"
- "Major mode for interacting with a Guile client application."
- (widget-minor-mode 1))
-
-(defvar gds-client nil
- "GDS client's port number.")
-(make-variable-buffer-local 'gds-client)
-
-(defvar gds-status nil
- "GDS client's latest status, one of the following symbols.
-`running' - Application is running.
-`waiting-for-input' - Application is blocked waiting for instruction
- from the frontend.
-`ready-for-input' - Application is not blocked but can also accept
- asynchronous instructions from the frontend.")
-(make-variable-buffer-local 'gds-status)
-
-(defvar gds-transcript nil
- "Transcript buffer for this GDS client.")
-(make-variable-buffer-local 'gds-transcript)
-
-;; Return client buffer for specified client and protocol input.
-(defun gds-client-buffer (client proc args)
- (if (eq proc 'name)
- ;; Introduction from client - create a new buffer.
- (with-current-buffer (generate-new-buffer (car args))
- (gds-mode)
- (setq gds-client client)
- (setq gds-transcript
- (find-file-noselect
- (expand-file-name (concat "~/.gds-transcript-" (car args)))))
- (with-current-buffer gds-transcript
- (goto-char (point-max))
- (insert "\nTranscript:\n"))
- (setq gds-buffers
- (cons (cons client (current-buffer))
- gds-buffers))
- (current-buffer))
- ;; Otherwise there should be an existing buffer that we can
- ;; return.
- (let ((existing (assq client gds-buffers)))
- (if (buffer-live-p (cdr existing))
- (cdr existing)
- (setq gds-buffers (delq existing gds-buffers))
- (gds-client-buffer client 'name '("(GDS buffer killed)"))))))
-
-;; Get the current buffer's associated client's value of SYM.
-(defun gds-client-ref (sym &optional client)
- (and (or client gds-client)
- (let ((buf (assq (or client gds-client) gds-buffers)))
- (and buf
- (cdr buf)
- (buffer-live-p (cdr buf))
- (with-current-buffer (cdr buf)
- (symbol-value sym))))))
-
-(defun gds-client-blocked ()
- (eq (gds-client-ref 'gds-status) 'waiting-for-input))
-
-(defvar gds-delayed-update-timer nil)
-
-(defvar gds-delayed-update-buffers nil)
-
-(defun gds-update-delayed-update-buffers ()
- (while gds-delayed-update-buffers
- (with-current-buffer (car gds-delayed-update-buffers)
- (setq gds-delayed-update-buffers
- (cdr gds-delayed-update-buffers))
- (gds-update-buffers))))
-
-(defun gds-update-buffers ()
- (if (timerp gds-delayed-update-timer)
- (cancel-timer gds-delayed-update-timer))
- (setq gds-delayed-update-timer nil)
- (let ((view (car gds-views))
- (inhibit-read-only t))
- (cond ((eq view 'stack)
- (gds-insert-stack))
- ((eq view 'interaction)
- (gds-insert-interaction))
- ((eq view 'browser)
- (gds-insert-modules))
- ((eq view 'messages)
- (gds-insert-messages))
- (t
- (error "Bad GDS view %S" view)))
- ;; Finish off.
- (force-mode-line-update t)))
-
-(defun gds-update-buffers-in-a-while ()
- (or (memq (current-buffer) gds-delayed-update-buffers)
- (setq gds-delayed-update-buffers
- (cons (current-buffer) gds-delayed-update-buffers)))
- (if (timerp gds-delayed-update-timer)
- nil
- (setq gds-delayed-update-timer
- (run-at-time 0.5 nil (function gds-update-delayed-update-buffers)))))
-
-(defun gds-display-buffers (client)
- (let ((buf (cdr (assq client gds-buffers))))
- ;; If there's already a window showing the buffer, use it.
- (let ((window (get-buffer-window buf t)))
- (if window
- (make-frame-visible (window-frame window))
- (display-buffer buf)))
- ;; If there is an associated source buffer, display it as well.
- (if (and (eq (car gds-views) 'stack)
- gds-frame-source-overlay
- (> (overlay-end gds-frame-source-overlay) 1))
- (let ((window (display-buffer
- (overlay-buffer gds-frame-source-overlay))))
- (set-window-point window
- (overlay-start gds-frame-source-overlay))))))
-
-
-;;;; Management of `views'.
-
-;; The idea here is to keep the buffer describing a Guile client
-;; relatively uncluttered by only showing one kind of information
-;; about that client at a time. Menu items and key sequences are
-;; provided to switch easily between the available views.
-
-(defvar gds-views nil
- "List of available views for a GDS client. Each element is one of
-the following symbols.
-`interaction' - Interaction with running client.
-`stack' - Call stack view.
-`browser' - Modules and bindings browser view.
-`breakpoints' - List of set breakpoints.
-`messages' - Non-GDS-protocol output from the debugger.")
-(make-variable-buffer-local 'gds-views)
-
-(defun gds-promote-view (view)
- (setq gds-views (cons view (delq view gds-views))))
-
-(defun gds-switch-to-view (view)
- (or (memq view gds-views)
- (error "View %S is not available" view))
- (gds-promote-view view)
- (gds-update-buffers))
-
-(defun gds-add-view (view)
- (or (memq view gds-views)
- (setq gds-views (append gds-views (list view)))))
-
-(defun gds-delete-view (view)
- (setq gds-views (delq view gds-views)))
-
-
-;;;; `Interaction' view.
-
-;; This view provides interaction with a normally running Guile
-;; client, in other words one that is not stopped in the debugger but
-;; is still available to take input from GDS (usually via a thread for
-;; that purpose). The view supports evaluation, help requests,
-;; control of `debug-on-exception' function, and methods for breaking
-;; into the running code.
-
-(defvar gds-current-module "()"
- "GDS client's current module.")
-(make-variable-buffer-local 'gds-current-module)
-
-(defvar gds-pid nil
- "GDS client's process ID.")
-(make-variable-buffer-local 'gds-pid)
-
-(defvar gds-debug-exceptions nil
- "Whether to debug exceptions.")
-(make-variable-buffer-local 'gds-debug-exceptions)
-
-(defvar gds-exception-keys "signal misc-error"
- "The exception keys for which to debug a GDS client.")
-(make-variable-buffer-local 'gds-exception-keys)
-
-(defvar gds-evals-in-progress nil
- "Alist describing evaluations in progress.")
-(make-variable-buffer-local 'gds-evals-in-progress)
-
-(defvar gds-results nil
- "Last help or evaluation results.")
-(make-variable-buffer-local 'gds-results)
-
-(defcustom gds-heading-face 'info-menu-header
- "*Face used for headings in Guile Interaction buffers."
- :type 'face
- :group 'gds)
-
-(defun gds-insert-interaction ()
- (erase-buffer)
- ;; Insert stuff for interacting with a running (non-blocked) Guile
- ;; client.
- (gds-heading-insert (buffer-name))
- (widget-insert " "
- (cdr (assq gds-status
- '((running . "running (cannot accept input)")
- (waiting-for-input . "waiting for input")
- (ready-for-input . "running")
- (closed . "closed"))))
- ", in "
- gds-current-module
- "\n\n")
- (widget-create 'push-button
- :notify (function gds-sigint)
- "SIGINT")
- (widget-insert " ")
- (widget-create 'push-button
- :notify (function gds-async-break)
- "Break")
- (widget-insert "\n")
- (widget-create 'checkbox
- :notify (function gds-toggle-debug-exceptions)
- gds-debug-exceptions)
- (widget-insert " Debug exception keys: ")
- (widget-create 'editable-field
- :notify (function gds-set-exception-keys)
- gds-exception-keys)
- ;; Evaluation report area.
- (widget-insert "\n")
- (gds-heading-insert "Recent Evaluations")
- (widget-insert " To run an evaluation, see the Guile->Evaluate menu.\n")
- (if gds-results
- (widget-insert "\n" (cdr gds-results)))
- (let ((evals gds-evals-in-progress))
- (while evals
- (widget-insert "\n" (cddar evals) " - running ")
- (let ((w (widget-create 'push-button
- :notify (function gds-interrupt-eval)
- "Interrupt")))
- (widget-put w :thread-number (caar evals)))
- (widget-insert "\n")
- (setq evals (cdr evals)))))
-
-(defun gds-heading-insert (text)
- (let ((start (point)))
- (widget-insert text)
- (let ((o (make-overlay start (point))))
- (overlay-put o 'face gds-heading-face)
- (overlay-put o 'evaporate t))))
-
-(defun gds-sigint (w &rest ignore)
- (interactive)
- (signal-process gds-pid 2))
-
-(defun gds-async-break (w &rest ignore)
- (interactive)
- (gds-send "async-break" gds-client))
-
-(defun gds-interrupt-eval (w &rest ignore)
- (interactive)
- (gds-send (format "interrupt-eval %S" (widget-get w :thread-number))
- gds-client))
-
-(defun gds-toggle-debug-exceptions (w &rest ignore)
- (interactive)
- (setq gds-debug-exceptions (widget-value w))
- (gds-eval-expression (concat "(use-modules (ice-9 debugger))"
- "(debug-on-error '("
- gds-exception-keys
- "))")))
-
-(defun gds-set-exception-keys (w &rest ignore)
- (interactive)
- (setq gds-exception-keys (widget-value w)))
-
-(defun gds-view-interaction ()
- (interactive)
- (gds-switch-to-view 'interaction))
-
-
-;;;; `Stack' view.
-
-;; This view shows the Guile call stack after the application has hit
-;; an error, or when it is stopped in the debugger.
-
-(defvar gds-stack nil
- "GDS client's stack when last stopped.")
-(make-variable-buffer-local 'gds-stack)
-
-(defun gds-insert-stack ()
- (erase-buffer)
- (let ((frames (car gds-stack))
- (index (cadr gds-stack))
- (flags (caddr gds-stack))
- frame items)
- (cond ((memq 'application flags)
- (widget-insert "Calling procedure:\n"))
- ((memq 'evaluation flags)
- (widget-insert "Evaluating expression:\n"))
- ((memq 'return flags)
- (widget-insert "Return value: "
- (cadr (memq 'return flags))
- "\n"))
- (t
- (widget-insert "Stack: " (prin1-to-string flags) "\n")))
- (let ((i -1))
- (gds-show-selected-frame (caddr (nth index frames)))
- (while frames
- (setq frame (car frames)
- frames (cdr frames)
- i (+ i 1)
- items (cons (list 'item
- (let ((s (cadr frame)))
- (put-text-property 0 1 'index i s)
- s))
- items))))
- (setq items (nreverse items))
- (apply (function widget-create)
- 'radio-button-choice
- :value (cadr (nth index items))
- :notify (function gds-select-stack-frame)
- items)
- (widget-insert "\n")
- (goto-char (point-min))))
-
-(defun gds-select-stack-frame (widget &rest ignored)
- (let* ((s (widget-value widget))
- (ind (memq 'index (text-properties-at 0 s))))
- (gds-send (format "debugger-command frame %d" (cadr ind))
- gds-client)))
-
-;; Overlay used to highlight the source expression corresponding to
-;; the selected frame.
-(defvar gds-frame-source-overlay nil)
-
-(defun gds-show-selected-frame (source)
- ;; Highlight the frame source, if possible.
- (if (and source
- (file-readable-p (car source)))
- (with-current-buffer (find-file-noselect (car source))
- (if gds-frame-source-overlay
- nil
- (setq gds-frame-source-overlay (make-overlay 0 0))
- (overlay-put gds-frame-source-overlay 'face 'highlight))
- ;; Move to source line. Note that Guile line numbering is
- ;; 0-based, while Emacs numbering is 1-based.
- (save-restriction
- (widen)
- (goto-line (+ (cadr source) 1))
- (move-to-column (caddr source))
- (move-overlay gds-frame-source-overlay
- (point)
- (if (not (looking-at ")"))
- (save-excursion (forward-sexp 1) (point))
- ;; It seems that the source coordinates for
- ;; backquoted expressions are at the end of
- ;; the sexp rather than the beginning...
- (save-excursion (forward-char 1)
- (backward-sexp 1) (point)))
- (current-buffer))))
- (if gds-frame-source-overlay
- (move-overlay gds-frame-source-overlay 0 0))))
-
-(defun gds-view-stack ()
- (interactive)
- (gds-switch-to-view 'stack))
-
-
-;;;; `Breakpoints' view.
-
-;; This view shows a list of breakpoints.
-
-(defun gds-view-breakpoints ()
- (interactive)
- (gds-switch-to-view 'breakpoints))
-
-
-;;;; `Browser' view.
-
-;; This view shows a list of modules and module bindings.
-
-(defcustom gds-module-filter '(t (guile nil) (ice-9 nil) (oop nil))
- "Specification of which Guile modules the debugger should display.
-This is a list with structure (DEFAULT EXCEPTION EXCEPTION...), where
-DEFAULT is `t' or `nil' and each EXCEPTION has the structure (SYMBOL
-DEFAULT EXCEPTION EXCEPTION...).
-
-A Guile module name `(x y z)' is matched against this filter as
-follows. If one of the top level EXCEPTIONs has SYMBOL `x', continue
-by matching the rest of the module name, in this case `(y z)', against
-that SYMBOL's DEFAULT and next level EXCEPTION list. Otherwise, if
-the current DEFAULT is `t' display the module, and if the current
-DEFAULT is `nil', don't display it.
-
-This variable is usually set to exclude Guile system modules that are
-not of primary interest when debugging application code."
- :type 'sexp
- :group 'gds)
-
-(defun gds-show-module-p (name)
- ;; Determine whether to display the NAMEd module by matching NAME
- ;; against `gds-module-filter'.
- (let ((default (car gds-module-filter))
- (exceptions (cdr gds-module-filter)))
- (let ((exception (assq (car name) exceptions)))
- (if exception
- (let ((gds-module-filter (cdr exception)))
- (gds-show-module-p (cdr name)))
- default))))
-
-(defvar gds-modules nil
- "GDS client's module information.
-Alist mapping module names to their symbols and related information.
-This looks like:
-
- (((guile) t sym1 sym2 ...)
- ((guile-user))
- ((ice-9 debug) nil sym3 sym4)
- ...)
-
-The `t' or `nil' after the module name indicates whether the module is
-displayed in expanded form (that is, showing the bindings in that
-module). The syms are actually all strings because some Guile symbols
-are not readable by Emacs.")
-(make-variable-buffer-local 'gds-modules)
-
-(defun gds-insert-modules ()
- (let ((p (if (eq (window-buffer (selected-window)) (current-buffer))
- (point)
- (point-min)))
- (modules gds-modules))
- (erase-buffer)
- (insert "Modules:\n")
- (while modules
- (let ((minfo (car modules)))
- (if (gds-show-module-p (car minfo))
- (let ((w (widget-create 'push-button
- :notify (function gds-module-notify)
- (if (and (cdr minfo)
- (cadr minfo))
- "-" "+"))))
- (widget-put w :module (cons gds-client (car minfo)))
- (widget-insert " " (prin1-to-string (car minfo)) "\n")
- (if (cadr minfo)
- (let ((syms (cddr minfo)))
- (while syms
- (widget-insert " > " (car syms) "\n")
- (setq syms (cdr syms))))))))
- (setq modules (cdr modules)))
- (insert "\n")
- (goto-char p)))
-
-(defun gds-module-notify (w &rest ignore)
- (let* ((module (widget-get w :module))
- (client (car module))
- (name (cdr module))
- (minfo (assoc name gds-modules)))
- (if (cdr minfo)
- ;; Just toggle expansion state.
- (progn
- (setcar (cdr minfo) (not (cadr minfo)))
- (gds-update-buffers))
- ;; Set flag to indicate module expanded.
- (setcdr minfo (list t))
- ;; Get symlist from Guile.
- (gds-send (format "query-module %S" name) client))))
-
-(defun gds-query-modules ()
- (interactive)
- (gds-send "query-modules" gds-client))
-
-(defun gds-view-browser ()
- (interactive)
- (or gds-modules (gds-query-modules))
- (gds-switch-to-view 'browser))
-
-
-;;;; `Messages' view.
-
-;; This view shows recent non-GDS-protocol messages output from the
-;; (ice-9 debugger) code.
-
-(defvar gds-output nil
- "GDS client's recent output (printed).")
-(make-variable-buffer-local 'gds-output)
-
-(defun gds-insert-messages ()
- (erase-buffer)
- ;; Insert recent non-protocol output from (ice-9 debugger).
- (insert gds-output)
- (goto-char (point-min)))
-
-(defun gds-view-messages ()
- (interactive)
- (gds-switch-to-view 'messages))
-
-
-;;;; Debugger commands.
-
-;; Typically but not necessarily used from the `stack' view.
-
-(defun gds-go ()
- (interactive)
- (gds-send "debugger-command continue" gds-client))
-
-(defun gds-next ()
- (interactive)
- (gds-send "debugger-command next 1" gds-client))
-
-(defun gds-evaluate (expr)
- (interactive "sEvaluate (in this stack frame): ")
- (gds-send (format "debugger-command evaluate %s" (prin1-to-string expr))
- gds-client))
-
-(defun gds-step-in ()
- (interactive)
- (gds-send "debugger-command step 1" gds-client))
-
-(defun gds-step-out ()
- (interactive)
- (gds-send "debugger-command finish" gds-client))
-
-(defun gds-trace-finish ()
- (interactive)
- (gds-send "debugger-command trace-finish" gds-client))
-
-(defun gds-frame-info ()
- (interactive)
- (gds-send "debugger-command info-frame" gds-client))
-
-(defun gds-frame-args ()
- (interactive)
- (gds-send "debugger-command info-args" gds-client))
-
-(defun gds-debug-trap-hooks ()
- (interactive)
- (gds-send "debugger-command debug-trap-hooks" gds-client))
-
-(defun gds-up ()
- (interactive)
- (gds-send "debugger-command up 1" gds-client))
-
-(defun gds-down ()
- (interactive)
- (gds-send "debugger-command down 1" gds-client))
-
-
-;;;; Setting breakpoints.
-
-(defun gds-set-breakpoint ()
- (interactive)
- (cond ((gds-in-source-buffer)
- (gds-set-source-breakpoint))
- ((gds-in-stack)
- (gds-set-stack-breakpoint))
- ((gds-in-modules)
- (gds-set-module-breakpoint))
- (t
- (error "No way to set a breakpoint from here"))))
-
-(defun gds-in-source-buffer ()
- ;; Not yet worked out what will be available in Scheme source
- ;; buffers.
- nil)
-
-(defun gds-in-stack ()
- (save-excursion
- (and (re-search-backward "^\\(Stack\\|Modules\\):" nil t)
- (looking-at "Stack"))))
-
-(defun gds-in-modules ()
- (save-excursion
- (and (re-search-backward "^\\(Stack\\|Modules\\):" nil t)
- (looking-at "Modules"))))
-
-(defun gds-set-module-breakpoint ()
- (let ((sym (save-excursion
- (beginning-of-line)
- (and (looking-at " > \\([^ \n\t]+\\)")
- (match-string 1))))
- (module (save-excursion
- (and (re-search-backward "^\\[[+---]\\] \\(([^)]+)\\)" nil t)
- (match-string 1)))))
- (or sym
- (error "Couldn't find procedure name on current line"))
- (or module
- (error "Couldn't find module name for current line"))
- (let ((behaviour
- (completing-read
- (format "Behaviour for breakpoint at %s:%s (default debug-here): "
- module sym)
- '(("debug-here")
- ("trace-here")
- ("trace-subtree"))
- nil
- t
- nil
- nil
- "debug-here")))
- (gds-send (format "set-breakpoint %s %s %s"
- module
- sym
- behaviour)
- gds-client))))
-
-
-;;;; Scheme source breakpoints.
-
-(defcustom gds-breakpoint-face 'default
- "*Face used to highlight the location of a source breakpoint.
-Specifically, this face highlights the opening parenthesis of the
-form where the breakpoint is set."
- :type 'face
- :group 'gds)
-
-(defcustom gds-new-breakpoint-before-string ""
- "*String used to show the presence of a new source breakpoint.
-`New' means that the breakpoint has been set but isn't yet known to
-Guile because the containing code hasn't been reevaluated yet.
-This string appears before the opening parenthesis of the form where
-the breakpoint is set. If you prefer a marker to appear after the
-opening parenthesis, make this string empty and use
-`gds-new-breakpoint-after-string'."
- :type 'string
- :group 'gds)
-
-(defcustom gds-new-breakpoint-after-string "=?= "
- "*String used to show the presence of a new source breakpoint.
-`New' means that the breakpoint has been set but isn't yet known to
-Guile because the containing code hasn't been reevaluated yet.
-This string appears after the opening parenthesis of the form where
-the breakpoint is set. If you prefer a marker to appear before the
-opening parenthesis, make this string empty and use
-`gds-new-breakpoint-before-string'."
- :type 'string
- :group 'gds)
-
-(defcustom gds-active-breakpoint-before-string ""
- "*String used to show the presence of a source breakpoint.
-`Active' means that the breakpoint is known to Guile.
-This string appears before the opening parenthesis of the form where
-the breakpoint is set. If you prefer a marker to appear after the
-opening parenthesis, make this string empty and use
-`gds-active-breakpoint-after-string'."
- :type 'string
- :group 'gds)
-
-(defcustom gds-active-breakpoint-after-string "=|= "
- "*String used to show the presence of a source breakpoint.
-`Active' means that the breakpoint is known to Guile.
-This string appears after the opening parenthesis of the form where
-the breakpoint is set. If you prefer a marker to appear before the
-opening parenthesis, make this string empty and use
-`gds-active-breakpoint-before-string'."
- :type 'string
- :group 'gds)
-
-(defun gds-source-breakpoint-pos ()
- "Return the position of the starting parenthesis of the innermost
-Scheme pair around point."
- (if (eq (char-syntax (char-after)) ?\()
- (point)
- (save-excursion
- (condition-case nil
- (while t (forward-sexp -1))
- (error))
- (forward-char -1)
- (while (not (eq (char-syntax (char-after)) ?\())
- (forward-char -1))
- (point))))
-
-(defun gds-source-breakpoint-overlay-at (pos)
- "Return the source breakpoint overlay at POS, if any."
- (let* (o (os (overlays-at pos)))
- (while os
- (if (and (overlay-get (car os) 'gds-breakpoint-info)
- (= (overlay-start (car os)) pos))
- (setq o (car os)
- os nil))
- (setq os (cdr os)))
- o))
-
-(defun gds-set-source-breakpoint ()
- (interactive)
- (let* ((pos (gds-source-breakpoint-pos))
- (o (gds-source-breakpoint-overlay-at pos)))
- (if o
- (error "There is already a breakpoint here!")
- (setq o (make-overlay pos (+ pos 1)))
- (overlay-put o 'evaporate t)
- (overlay-put o 'face gds-breakpoint-face)
- (overlay-put o 'gds-breakpoint-info 0)
- (overlay-put o 'before-string gds-new-breakpoint-before-string)
- (overlay-put o 'after-string gds-new-breakpoint-after-string))))
-
-(defun gds-delete-source-breakpoint ()
- (interactive)
- (let* ((pos (gds-source-breakpoint-pos))
- (o (gds-source-breakpoint-overlay-at pos)))
- (or o
- (error "There is no breakpoint here to delete!"))
- (delete-overlay o)))
-
-(defun gds-region-breakpoint-info (beg end)
- "Return an alist of breakpoints in REGION.
-The car of each alist element is a cons (LINE . COLUMN) giving the
-source location of the breakpoint. The cdr is information describing
-breakpoint properties. Currently `information' is just the breakpoint
-index, for an existing Guile breakpoint, or 0 for a breakpoint that
-isn't yet known to Guile."
- (interactive "r")
- (let ((os (overlays-in beg end))
- info o)
- (while os
- (setq o (car os)
- os (cdr os))
- (if (overlay-get o 'gds-breakpoint-info)
- (progn
- (setq info
- (cons (cons (save-excursion
- (goto-char (overlay-start o))
- (cons (save-excursion
- (beginning-of-line)
- (count-lines (point-min) (point)))
- (current-column)))
- (overlay-get o 'gds-breakpoint-info))
- info))
- ;; Also now mark the breakpoint as `new'. It will become
- ;; `active' (again) when we receive a notification from
- ;; Guile that the breakpoint has been set.
- (overlay-put o 'gds-breakpoint-info 0)
- (overlay-put o 'before-string gds-new-breakpoint-before-string)
- (overlay-put o 'after-string gds-new-breakpoint-after-string))))
- (nreverse info)))
-
-
-;;;; Evaluating code.
-
-;; The following commands send code for evaluation through the GDS TCP
-;; connection, receive the result and any output generated through the
-;; same connection, and display the result and output to the user.
-;;
-;; For each buffer where evaluations can be requested, GDS uses the
-;; buffer-local variable `gds-client' to track which GDS client
-;; program should receive and handle that buffer's evaluations. In
-;; the common case where GDS is only managing one client program, a
-;; buffer's value of `gds-client' is set automatically to point to
-;; that program the first time that an evaluation (or help or
-;; completion) is requested. If there are multiple GDS clients
-;; running at that time, GDS asks the user which one is intended.
-
-(defun gds-read-client ()
- (let* ((def (and gds-client (cdr (assq gds-client gds-names))))
- (prompt (if def
- (concat "Application for eval (default "
- def
- "): ")
- "Application for eval: "))
- (name
- (completing-read prompt
- (mapcar (function list)
- (mapcar (function cdr) gds-names))
- nil t nil nil
- def)))
- (let (client (names gds-names))
- (while (and names (not client))
- (if (string-equal (cdar names) name)
- (setq client (caar names)))
- (setq names (cdr names)))
- client)))
-
-(defun gds-choose-client (client)
- ;; Only keep the supplied client number if it is still valid.
- (if (integerp client)
- (setq client (gds-client-ref 'gds-client client)))
- ;; Only keep the current buffer's setting of `gds-client' if it is
- ;; still valid.
- (if gds-client
- (setq gds-client (gds-client-ref 'gds-client)))
-
- (or ;; If client is an integer, it is the port number of the
- ;; intended client.
- (if (integerp client)
- client)
- ;; Any other non-nil value indicates invocation with a prefix
- ;; arg, which forces asking the user which application is
- ;; intended.
- (if client
- (setq gds-client (gds-read-client)))
- ;; If ask not forced, and current buffer is associated with a
- ;; client, use that client.
- gds-client
- ;; If there are no clients at this point, and we are
- ;; allowed to autostart a captive Guile, do so.
- (and (null gds-buffers)
- gds-autostart-captive
- (progn
- (gds-start-captive t)
- (while (null gds-buffers)
- (accept-process-output (get-buffer-process gds-captive)
- 0 100000))
- (setq gds-client (caar gds-buffers))))
- ;; If there is only one known client, use that one.
- (if (and (car gds-buffers)
- (null (cdr gds-buffers)))
- (setq gds-client (caar gds-buffers)))
- ;; Last resort - ask the user.
- (setq gds-client (gds-read-client))
- ;; Signal an error.
- (error "No application chosen.")))
-
-(defun gds-module-name (start end)
- "Determine and return the name of the module that governs the
-specified region. The module name is returned as a list of symbols."
- (interactive "r") ; why not?
- (save-excursion
- (goto-char start)
- (let (module-name)
- (while (and (not module-name)
- (beginning-of-defun-raw 1))
- (if (looking-at "(define-module ")
- (setq module-name
- (progn
- (goto-char (match-end 0))
- (read (current-buffer))))))
- module-name)))
-
-(defun gds-port-name (start end)
- "Return port name for the specified region of the current buffer.
-The name will be used by Guile as the port name when evaluating that
-region's code."
- (or (buffer-file-name)
- (concat "Emacs buffer: " (buffer-name))))
-
-(defun gds-eval-region (start end &optional client)
- "Evaluate the current region."
- (interactive "r\nP")
- (setq client (gds-choose-client client))
- (let ((module (gds-module-name start end))
- (port-name (gds-port-name start end))
- line column)
- (save-excursion
- (goto-char start)
- (setq column (current-column)) ; 0-based
- (beginning-of-line)
- (setq line (count-lines (point-min) (point)))) ; 0-based
- (let ((code (buffer-substring-no-properties start end)))
- (gds-send (format "eval (region . %S) %s %S %d %d %s %S"
- (gds-abbreviated code)
- (if module (prin1-to-string module) "#f")
- port-name line column
- (let ((bpinfo (gds-region-breakpoint-info start end)))
- ;; Make sure that "no bpinfo" is represented
- ;; as "()", not "nil", as Scheme doesn't
- ;; understand "nil".
- (if bpinfo (format "%S" bpinfo) "()"))
- code)
- client))))
-
-(defun gds-eval-expression (expr &optional client correlator)
- "Evaluate the supplied EXPR (a string)."
- (interactive "sEvaluate expression: \nP")
- (setq client (gds-choose-client client))
- (set-text-properties 0 (length expr) nil expr)
- (gds-send (format "eval (%S . %S) #f \"Emacs expression\" 0 0 () %S"
- (or correlator 'expression)
- (gds-abbreviated expr)
- expr)
- client))
-
-(defconst gds-abbreviated-length 35)
-
-(defun gds-abbreviated (code)
- (let ((nlpos (string-match (regexp-quote "\n") code)))
- (while nlpos
- (setq code
- (if (= nlpos (- (length code) 1))
- (substring code 0 nlpos)
- (concat (substring code 0 nlpos)
- "\\n"
- (substring code (+ nlpos 1)))))
- (setq nlpos (string-match (regexp-quote "\n") code))))
- (if (> (length code) gds-abbreviated-length)
- (concat (substring code 0 (- gds-abbreviated-length 3)) "...")
- code))
-
-(defun gds-eval-defun (&optional client)
- "Evaluate the defun (top-level form) at point."
- (interactive "P")
- (save-excursion
- (end-of-defun)
- (let ((end (point)))
- (beginning-of-defun)
- (gds-eval-region (point) end client))))
-
-(defun gds-eval-last-sexp (&optional client)
- "Evaluate the sexp before point."
- (interactive "P")
- (gds-eval-region (save-excursion (backward-sexp) (point)) (point) client))
-
-
-;;;; Help.
-
-;; Help is implemented as a special case of evaluation, identified by
-;; the evaluation correlator 'help.
-
-(defun gds-help-symbol (sym &optional client)
- "Get help for SYM (a Scheme symbol)."
- (interactive
- (let ((sym (thing-at-point 'symbol))
- (enable-recursive-minibuffers t)
- val)
- (setq val (read-from-minibuffer
- (if sym
- (format "Describe Guile symbol (default %s): " sym)
- "Describe Guile symbol: ")))
- (list (if (zerop (length val)) sym val)
- current-prefix-arg)))
- (gds-eval-expression (format "(help %s)" sym) client 'help))
-
-(defun gds-apropos (regex &optional client)
- "List Guile symbols matching REGEX."
- (interactive
- (let ((sym (thing-at-point 'symbol))
- (enable-recursive-minibuffers t)
- val)
- (setq val (read-from-minibuffer
- (if sym
- (format "Guile apropos (regexp, default \"%s\"): " sym)
- "Guile apropos (regexp): ")))
- (list (if (zerop (length val)) sym val)
- current-prefix-arg)))
- (set-text-properties 0 (length regex) nil regex)
- (gds-eval-expression (format "(apropos %S)" regex) client 'help))
-
-(defvar gds-completion-results nil)
-
-(defun gds-complete-symbol (&optional client)
- "Complete the Guile symbol before point. Returns `t' if anything
-interesting happened, `nil' if not."
- (interactive "P")
- (let* ((chars (- (point) (save-excursion
- (while (let ((syntax (char-syntax (char-before (point)))))
- (or (eq syntax ?w) (eq syntax ?_)))
- (forward-char -1))
- (point)))))
- (if (zerop chars)
- nil
- (setq client (gds-choose-client client))
- (setq gds-completion-results nil)
- (gds-send (format "complete %s"
- (prin1-to-string
- (buffer-substring-no-properties (- (point) chars)
- (point))))
- client)
- (while (null gds-completion-results)
- (accept-process-output gds-process 0 200))
- (cond ((eq gds-completion-results t)
- nil)
- ((stringp gds-completion-results)
- (if (<= (length gds-completion-results) chars)
- nil
- (insert (substring gds-completion-results chars))
- (message "Sole completion")
- t))
- ((= (length gds-completion-results) 1)
- (if (<= (length (car gds-completion-results)) chars)
- nil
- (insert (substring (car gds-completion-results) chars))
- t))
- (t
- (with-output-to-temp-buffer "*Completions*"
- (display-completion-list gds-completion-results))
- t)))))
-
-
-;;;; Display of evaluation and help results.
-
-(defun gds-display-results (client correlator results)
- (let ((helpp (eq (car correlator) 'help)))
- (let ((buf (get-buffer-create (if helpp
- "*Guile Help*"
- "*Guile Results*"))))
- (setq gds-results
- (save-excursion
- (set-buffer buf)
- (erase-buffer)
- (scheme-mode)
- (insert (cdr correlator) "\n\n")
- (while results
- (insert (car results))
- (or (bolp) (insert "\\\n"))
- (if helpp
- nil
- (if (cadr results)
- (mapcar (function (lambda (value)
- (insert " => " value "\n")))
- (cadr results))
- (insert " => no (or unspecified) value\n"))
- (insert "\n"))
- (setq results (cddr results)))
- (goto-char (point-min))
- (if (and helpp (looking-at "Evaluating in "))
- (delete-region (point) (progn (forward-line 1) (point))))
- (cons correlator (buffer-string))))
- ;;(pop-to-buffer buf)
- ;;(run-hooks 'temp-buffer-show-hook)
- ;;(other-window 1)
- ))
- (gds-promote-view 'interaction)
- (gds-request-focus client))
-
-
-;;;; Loading (evaluating) a whole Scheme file.
-
-(defcustom gds-source-modes '(scheme-mode)
- "*Used to determine if a buffer contains Scheme source code.
-If it's loaded into a buffer that is in one of these major modes, it's
-considered a scheme source file by `gds-load-file'."
- :type '(repeat function)
- :group 'gds)
-
-(defvar gds-prev-load-dir/file nil
- "Holds the last (directory . file) pair passed to `gds-load-file'.
-Used for determining the default for the next `gds-load-file'.")
-
-(defun gds-load-file (file-name &optional client)
- "Load a Scheme file into the inferior Scheme process."
- (interactive (list (car (comint-get-source "Load Scheme file: "
- gds-prev-load-dir/file
- gds-source-modes t))
- ; T because LOAD needs an
- ; exact name
- current-prefix-arg))
- (comint-check-source file-name) ; Check to see if buffer needs saved.
- (setq gds-prev-load-dir/file (cons (file-name-directory file-name)
- (file-name-nondirectory file-name)))
- (setq client (gds-choose-client client))
- (gds-send (format "load %S" file-name) client))
-
-
-;;;; Scheme mode keymap items.
-
-(define-key scheme-mode-map "\M-\C-x" 'gds-eval-defun);gnu convention
-(define-key scheme-mode-map "\C-x\C-e" 'gds-eval-last-sexp);gnu convention
-(define-key scheme-mode-map "\C-c\C-e" 'gds-eval-expression)
-(define-key scheme-mode-map "\C-c\C-r" 'gds-eval-region)
-(define-key scheme-mode-map "\C-c\C-l" 'gds-load-file)
-(define-key scheme-mode-map "\C-hg" 'gds-help-symbol)
-(define-key scheme-mode-map "\C-h\C-g" 'gds-apropos)
-(define-key scheme-mode-map "\e\t" 'gds-complete-symbol)
-(define-key scheme-mode-map "\C-x " 'gds-set-source-breakpoint)
-(define-key scheme-mode-map "\C-x\e " 'gds-delete-source-breakpoint)
-
-
-;;;; Guile Interaction mode keymap and menu items.
-
-(define-key gds-mode-map "M" (function gds-query-modules))
-
-(define-key gds-mode-map "g" (function gds-go))
-(define-key gds-mode-map "q" (function gds-quit))
-(define-key gds-mode-map " " (function gds-next))
-(define-key gds-mode-map "e" (function gds-evaluate))
-(define-key gds-mode-map "i" (function gds-step-in))
-(define-key gds-mode-map "o" (function gds-step-out))
-(define-key gds-mode-map "t" (function gds-trace-finish))
-(define-key gds-mode-map "I" (function gds-frame-info))
-(define-key gds-mode-map "A" (function gds-frame-args))
-(define-key gds-mode-map "H" (function gds-debug-trap-hooks))
-(define-key gds-mode-map "u" (function gds-up))
-(define-key gds-mode-map "d" (function gds-down))
-(define-key gds-mode-map "b" (function gds-set-breakpoint))
-
-(define-key gds-mode-map "vi" (function gds-view-interaction))
-(define-key gds-mode-map "vs" (function gds-view-stack))
-(define-key gds-mode-map "vb" (function gds-view-breakpoints))
-(define-key gds-mode-map "vB" (function gds-view-browser))
-(define-key gds-mode-map "vm" (function gds-view-messages))
-
-(defvar gds-view-menu nil
- "GDS view menu.")
-(if gds-view-menu
- nil
- (setq gds-view-menu (make-sparse-keymap "View"))
- (define-key gds-view-menu [messages]
- '(menu-item "Messages" gds-view-messages
- :enable (memq 'messages gds-views)))
- (define-key gds-view-menu [browser]
- '(menu-item "Browser" gds-view-browser
- :enable (memq 'browser gds-views)))
- (define-key gds-view-menu [breakpoints]
- '(menu-item "Breakpoints" gds-view-breakpoints
- :enable (memq 'breakpoints gds-views)))
- (define-key gds-view-menu [stack]
- '(menu-item "Stack" gds-view-stack
- :enable (memq 'stack gds-views)))
- (define-key gds-view-menu [interaction]
- '(menu-item "Interaction" gds-view-interaction
- :enable (memq 'interaction gds-views))))
-
-(defvar gds-debug-menu nil
- "GDS debugging menu.")
-(if gds-debug-menu
- nil
- (setq gds-debug-menu (make-sparse-keymap "Debug"))
- (define-key gds-debug-menu [go]
- '(menu-item "Go" gds-go))
- (define-key gds-debug-menu [down]
- '(menu-item "Move Down 1 Frame" gds-down))
- (define-key gds-debug-menu [up]
- '(menu-item "Move Up 1 Frame" gds-up))
- (define-key gds-debug-menu [trace-finish]
- '(menu-item "Trace This Frame" gds-trace-finish))
- (define-key gds-debug-menu [step-out]
- '(menu-item "Finish This Frame" gds-step-out))
- (define-key gds-debug-menu [next]
- '(menu-item "Next" gds-next))
- (define-key gds-debug-menu [step-in]
- '(menu-item "Single Step" gds-step-in))
- (define-key gds-debug-menu [eval]
- '(menu-item "Eval In This Frame..." gds-evaluate)))
-
-(defvar gds-breakpoint-menu nil
- "GDS breakpoint menu.")
-(if gds-breakpoint-menu
- nil
- (setq gds-breakpoint-menu (make-sparse-keymap "Breakpoint"))
- (define-key gds-breakpoint-menu [last-sexp]
- '(menu-item "Delete Breakpoint" gds-delete-source-breakpoint))
- (define-key gds-breakpoint-menu [set]
- '(menu-item "Set Breakpoint" gds-set-source-breakpoint)))
-
-(defvar gds-eval-menu nil
- "GDS evaluation menu.")
-(if gds-eval-menu
- nil
- (setq gds-eval-menu (make-sparse-keymap "Evaluate"))
- (define-key gds-eval-menu [load-file]
- '(menu-item "Load Scheme File" gds-load-file))
- (define-key gds-eval-menu [defun]
- '(menu-item "Defun At Point" gds-eval-defun))
- (define-key gds-eval-menu [region]
- '(menu-item "Region" gds-eval-region))
- (define-key gds-eval-menu [last-sexp]
- '(menu-item "Sexp Before Point" gds-eval-last-sexp))
- (define-key gds-eval-menu [expr]
- '(menu-item "Expression..." gds-eval-expression)))
-
-(defvar gds-help-menu nil
- "GDS help menu.")
-(if gds-help-menu
- nil
- (setq gds-help-menu (make-sparse-keymap "Help"))
- (define-key gds-help-menu [apropos]
- '(menu-item "Apropos..." gds-apropos))
- (define-key gds-help-menu [sym]
- '(menu-item "Symbol..." gds-help-symbol)))
-
-(defvar gds-advanced-menu nil
- "Menu of rarely needed GDS operations.")
-(if gds-advanced-menu
- nil
- (setq gds-advanced-menu (make-sparse-keymap "Advanced"))
- (define-key gds-advanced-menu [run-captive]
- '(menu-item "Run Captive Guile" gds-start-captive
- :enable (not (comint-check-proc gds-captive))))
- (define-key gds-advanced-menu [restart-gds]
- '(menu-item "Restart IDE" gds-start :enable gds-process))
- (define-key gds-advanced-menu [kill-gds]
- '(menu-item "Shutdown IDE" gds-shutdown :enable gds-process))
- (define-key gds-advanced-menu [start-gds]
- '(menu-item "Start IDE" gds-start :enable (not gds-process))))
-
-(defvar gds-menu nil
- "Global menu for GDS commands.")
-(if gds-menu
- nil
- (setq gds-menu (make-sparse-keymap "Guile"))
- (define-key gds-menu [advanced]
- (cons "Advanced" gds-advanced-menu))
- (define-key gds-menu [separator-1]
- '("--"))
- (define-key gds-menu [view]
- `(menu-item "View" ,gds-view-menu :enable gds-views))
- (define-key gds-menu [debug]
- `(menu-item "Debug" ,gds-debug-menu :enable (and gds-client
- (gds-client-blocked))))
- (define-key gds-menu [breakpoint]
- `(menu-item "Breakpoints" ,gds-breakpoint-menu :enable t))
- (define-key gds-menu [eval]
- `(menu-item "Evaluate" ,gds-eval-menu :enable (or gds-buffers
- gds-autostart-captive)))
- (define-key gds-menu [help]
- `(menu-item "Help" ,gds-help-menu :enable (or gds-buffers
- gds-autostart-captive)))
- (setq menu-bar-final-items
- (cons 'guile menu-bar-final-items))
- (define-key scheme-mode-map [menu-bar guile]
- (cons "Guile" gds-menu)))
-
-
-;;;; Autostarting the GDS server.
-
-(defcustom gds-autostart-server t
- "Whether to automatically start the GDS server when `gds.el' is loaded."
- :type 'boolean
- :group 'gds)
-
-
-;;;; `Captive' Guile - a Guile process that is started when needed to
-;;;; provide help, completion, evaluations etc.
-
-(defcustom gds-autostart-captive t
- "Whether to automatically start a `captive' Guile process when needed."
- :type 'boolean
- :group 'gds)
-
-(defvar gds-captive nil
- "Buffer of captive Guile.")
-
-(defun gds-start-captive (&optional restart)
- (interactive)
- (if (and restart
- (comint-check-proc gds-captive))
- (gds-kill-captive))
- (if (comint-check-proc gds-captive)
- nil
- (let ((process-connection-type nil))
- (setq gds-captive (make-comint "captive-guile"
- gds-guile-program
- nil
- "-q")))
- (let ((proc (get-buffer-process gds-captive)))
- (process-kill-without-query proc)
- (comint-send-string proc "(set! %load-path (cons \"/home/neil/Guile/cvs/guile-core\" %load-path))\n")
- (comint-send-string proc "(debug-enable 'backtrace)\n")
- (comint-send-string proc "(use-modules (emacs gds-client))\n")
- (comint-send-string proc "(gds-connect \"Captive Guile\" #f)\n"))))
-
-(defun gds-kill-captive ()
- (if gds-captive
- (condition-case nil
- (progn
- (kill-process (get-buffer-process gds-captive))
- (accept-process-output gds-process 0 200))
- (error))))
-
-
-;;;; If requested, autostart the server after loading.
-
-(if (and gds-autostart-server
- (not gds-process))
- (gds-start))
-
-
-;;;; The end!
-
-(provide 'gds)
-
-;;; gds.el ends here.
diff --git a/emacs/gud-guile.el b/emacs/gud-guile.el
index a0a70fabe..036194663 100644
--- a/emacs/gud-guile.el
+++ b/emacs/gud-guile.el
@@ -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.
;;; Author: Thien-Thi Nguyen <ttn@gnu.org>
;;; Version: 1
diff --git a/emacs/guile-c.el b/emacs/guile-c.el
index fe05159ec..af74b81e0 100644
--- a/emacs/guile-c.el
+++ b/emacs/guile-c.el
@@ -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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/emacs/guile-emacs.scm b/emacs/guile-emacs.scm
index 78b897e31..000d0cc2e 100644
--- a/emacs/guile-emacs.scm
+++ b/emacs/guile-emacs.scm
@@ -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.
;;; Code:
diff --git a/emacs/guile-scheme.el b/emacs/guile-scheme.el
index 10ea10db7..5bd9a7c24 100644
--- a/emacs/guile-scheme.el
+++ b/emacs/guile-scheme.el
@@ -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.
;;; Commentary:
diff --git a/emacs/guile.el b/emacs/guile.el
index 15f866fbb..e85c81c29 100644
--- a/emacs/guile.el
+++ b/emacs/guile.el
@@ -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.
;;; Code:
diff --git a/emacs/multistring.el b/emacs/multistring.el
index 7b0ef30c1..25141ac58 100644
--- a/emacs/multistring.el
+++ b/emacs/multistring.el
@@ -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.
;;; Author: Mikael Djurfeldt <djurfeldt@nada.kth.se>
diff --git a/emacs/patch.el b/emacs/patch.el
index 868310a80..735a5468b 100644
--- a/emacs/patch.el
+++ b/emacs/patch.el
@@ -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.
;;; Author: Thien-Thi Nguyen <ttn@gnu.org>
;;; Version: 1
diff --git a/emacs/ppexpand.el b/emacs/ppexpand.el
index 39e113fba..2beb3bff6 100644
--- a/emacs/ppexpand.el
+++ b/emacs/ppexpand.el
@@ -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.
;;; Author: Mikael Djurfeldt <djurfeldt@nada.kth.se>
diff --git a/emacs/update-changelog.el b/emacs/update-changelog.el
index f9e4ff2ac..96db255b2 100644
--- a/emacs/update-changelog.el
+++ b/emacs/update-changelog.el
@@ -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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 504ba06ff..4b865c9ee 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
SUBDIRS = scripts box box-module box-dynamic box-dynamic-module\
modules safe
diff --git a/examples/box-dynamic-module/Makefile.am b/examples/box-dynamic-module/Makefile.am
index 665a7de54..9127ee500 100644
--- a/examples/box-dynamic-module/Makefile.am
+++ b/examples/box-dynamic-module/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README box.c box-module.scm box-mixed.scm check.test
diff --git a/examples/box-dynamic-module/box.c b/examples/box-dynamic-module/box.c
index 180190e9e..bb25e5cc9 100644
--- a/examples/box-dynamic-module/box.c
+++ b/examples/box-dynamic-module/box.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 all needed declarations. */
diff --git a/examples/box-dynamic/Makefile.am b/examples/box-dynamic/Makefile.am
index 574eadb85..442af724a 100644
--- a/examples/box-dynamic/Makefile.am
+++ b/examples/box-dynamic/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README box.c check.test
diff --git a/examples/box-dynamic/box.c b/examples/box-dynamic/box.c
index 9379b86a5..6f26c8d76 100644
--- a/examples/box-dynamic/box.c
+++ b/examples/box-dynamic/box.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 all needed declarations. */
diff --git a/examples/box-module/Makefile.am b/examples/box-module/Makefile.am
index 3fe82e7cd..a1a796e21 100644
--- a/examples/box-module/Makefile.am
+++ b/examples/box-module/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README box.c check.test
diff --git a/examples/box-module/box.c b/examples/box-module/box.c
index 90f6881dd..07d54f0c4 100644
--- a/examples/box-module/box.c
+++ b/examples/box-module/box.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 all needed declarations. */
diff --git a/examples/box/Makefile.am b/examples/box/Makefile.am
index 3fe82e7cd..a1a796e21 100644
--- a/examples/box/Makefile.am
+++ b/examples/box/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README box.c check.test
diff --git a/examples/box/box.c b/examples/box/box.c
index e526fa880..2dad082cd 100644
--- a/examples/box/box.c
+++ b/examples/box/box.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 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 all needed declarations. */
diff --git a/examples/compat/compat.h b/examples/compat/compat.h
index 20cc566c4..839025fd0 100644
--- a/examples/compat/compat.h
+++ b/examples/compat/compat.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/examples/modules/Makefile.am b/examples/modules/Makefile.am
index a6a9e0e03..215ba5ddf 100644
--- a/examples/modules/Makefile.am
+++ b/examples/modules/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README module-0.scm module-1.scm module-2.scm main check.test
diff --git a/examples/safe/Makefile.am b/examples/safe/Makefile.am
index 16c2f1687..3564e4f23 100644
--- a/examples/safe/Makefile.am
+++ b/examples/safe/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README safe untrusted.scm evil.scm check.test
diff --git a/examples/scripts/Makefile.am b/examples/scripts/Makefile.am
index 3a82dad77..8d410c052 100644
--- a/examples/scripts/Makefile.am
+++ b/examples/scripts/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
EXTRA_DIST = README simple-hello.scm hello fact check.test
diff --git a/guile-config/Makefile.am b/guile-config/Makefile.am
index 19c7a6fbf..c6f691e65 100644
--- a/guile-config/Makefile.am
+++ b/guile-config/Makefile.am
@@ -17,8 +17,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
bin_SCRIPTS=guile-config
CLEANFILES=guile-config
diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in
index 8a6e434cc..1ee3215cd 100644
--- a/guile-config/guile-config.in
+++ b/guile-config/guile-config.in
@@ -18,7 +18,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;; TODO:
;;; * Add some plausible structure for returning the right exit status,
diff --git a/guile-config/guile.m4 b/guile-config/guile.m4
index 6c17849bd..af0172f7f 100644
--- a/guile-config/guile.m4
+++ b/guile-config/guile.m4
@@ -14,7 +14,7 @@
##
## You should have received a copy of the GNU Lesser General Public
## License along with this library; 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
## Index
## -----
diff --git a/guile-config/qthreads.m4 b/guile-config/qthreads.m4
index 8557620a5..0eacc0b3d 100644
--- a/guile-config/qthreads.m4
+++ b/guile-config/qthreads.m4
@@ -17,8 +17,8 @@ dnl GNU General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public
dnl License along with GUILE; see the file COPYING. If not, write
-dnl to the Free Software Foundation, Inc., 59 Temple Place, Suite
-dnl 330, Boston, MA 02111-1307 USA
+dnl to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+dnl Floor, Boston, MA 02110-1301 USA
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index 6b62dfb0a..b22061c7a 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
SUBDIRS = ice-9
diff --git a/guile-readline/ice-9/Makefile.am b/guile-readline/ice-9/Makefile.am
index 9d0619160..59e4b35d7 100644
--- a/guile-readline/ice-9/Makefile.am
+++ b/guile-readline/ice-9/Makefile.am
@@ -17,8 +17,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
guile_pdd = $(patsubst %/guile-readline,%/guile,$(pkgdatadir))
ice9dir = $(guile_pdd)/$(GUILE_EFFECTIVE_VERSION)/ice-9
diff --git a/guile-readline/ice-9/readline.scm b/guile-readline/ice-9/readline.scm
index ad40dcba2..85d41726e 100644
--- a/guile-readline/ice-9/readline.scm
+++ b/guile-readline/ice-9/readline.scm
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 Daniel Risacher <risacher@worldnet.att.net>.
;;;; Extensions based upon code by
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 864d4fa41..8cf4ae0e1 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
*/
diff --git a/guile-readline/readline.h b/guile-readline/readline.h
index 1fc51de4f..6ea10d278 100644
--- a/guile-readline/readline.h
+++ b/guile-readline/readline.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
*/
diff --git a/guile-tools.in b/guile-tools.in
index 3b0bdc31e..a59485774 100644
--- a/guile-tools.in
+++ b/guile-tools.in
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
# Usage: See `help' func below.
#
diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index 7853faab2..91e827759 100644
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/ice-9/and-let-star.scm b/ice-9/and-let-star.scm
index 6604df163..7a7380173 100644
--- a/ice-9/and-let-star.scm
+++ b/ice-9/and-let-star.scm
@@ -15,7 +15,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (ice-9 and-let-star)
:export-syntax (and-let*))
diff --git a/ice-9/arrays.scm b/ice-9/arrays.scm
index a29396b81..c268ced7d 100644
--- a/ice-9/arrays.scm
+++ b/ice-9/arrays.scm
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 (array-shape a)
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index bc076d5e2..c8889f46e 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -15,7 +15,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/buffered-input.scm b/ice-9/buffered-input.scm
index 8406cd8b5..3942ccd5e 100644
--- a/ice-9/buffered-input.scm
+++ b/ice-9/buffered-input.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (ice-9 buffered-input)
#:export (make-buffered-input-port
diff --git a/ice-9/calling.scm b/ice-9/calling.scm
index f9637f7e7..d60e52aa5 100644
--- a/ice-9/calling.scm
+++ b/ice-9/calling.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 calling)
diff --git a/ice-9/channel.scm b/ice-9/channel.scm
index 30e617412..79481d43c 100644
--- a/ice-9/channel.scm
+++ b/ice-9/channel.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/ice-9/common-list.scm b/ice-9/common-list.scm
index b3f2091bd..29b25b1fd 100644
--- a/ice-9/common-list.scm
+++ b/ice-9/common-list.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/debug.scm b/ice-9/debug.scm
index 2496b4289..3dd7c8cd2 100644
--- a/ice-9/debug.scm
+++ b/ice-9/debug.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; The author can be reached at djurfeldt@nada.kth.se
;;;; Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
diff --git a/ice-9/debugger.scm b/ice-9/debugger.scm
index 3e4250ef0..99f2d5037 100644
--- a/ice-9/debugger.scm
+++ b/ice-9/debugger.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 debugger)
#:use-module (ice-9 debugger command-loop)
diff --git a/ice-9/debugger/Makefile.am b/ice-9/debugger/Makefile.am
index 9a9df1043..83f92867d 100644
--- a/ice-9/debugger/Makefile.am
+++ b/ice-9/debugger/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/ice-9/debugger/behaviour.scm b/ice-9/debugger/behaviour.scm
index b72a769dd..e69de29bb 100644
--- a/ice-9/debugger/behaviour.scm
+++ b/ice-9/debugger/behaviour.scm
@@ -1,353 +0,0 @@
-;;;; (ice-9 debugger behaviour) -- what to do when you hit a breakpoint
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (ice-9 debugger behaviour)
- #:use-module (ice-9 and-let-star)
- #:use-module (ice-9 debug)
- #:use-module (ice-9 debugger)
- #:use-module (ice-9 debugger trap-hooks)
- #:use-module (ice-9 debugger trc)
- #:use-module (ice-9 debugger utils)
- #:use-module (ice-9 optargs)
- #:export (at-exit
- at-entry
- at-apply
- at-step
- at-next
- debug-here
- trace-here
- trace-until-exit
- trace-subtree
- trace-exit-value
- add-debug-entry-message
- with-reference-frame
- with-reference-frame*))
-
-;;; This module defines useful kinds of behaviour for breakpoints.
-
-(define *trap* #f)
-(define *cont* #f)
-(define *frame* #f)
-(define *depth* #f)
-(define *expr* #f)
-(define *retval* #f)
-(define *trace-retval* #f)
-(define *trace-entry* #f)
-(define *trace-depths* '())
-(define *debug-flag* #f)
-
-(add-hook! before-enter-frame-hook
- (lambda (cont tail? expr)
- (trc 'before-enter-frame-hook cont tail? expr)
- (set! *trap* #:evaluation)
- (set! *cont* cont)
- (set! *frame* (last-stack-frame cont))
- (set! *depth* (stack-length (make-stack cont)))
- (set! *expr* expr)
- (set! *trace-entry* #t)
- (set! *debug-flag* #f)
- (set! *debug-entry-messages* '())))
-
-(add-hook! before-apply-frame-hook
- (lambda (cont tail?)
- (trc 'before-apply-frame-hook cont tail?)
- (set! *trap* #:application)
- (set! *cont* cont)
- (set! *frame* (last-stack-frame cont))
- (set! *depth* (stack-length (make-stack cont)))
- (set! *expr* #f)
- (set! *trace-entry* #t)
- (set! *debug-flag* #f)
- (set! *debug-entry-messages* '())))
-
-(add-hook! before-exit-frame-hook
- (lambda (cont retval)
- (trc 'before-exit-frame-hook cont retval)
- (set! *trap* #:return)
- (set! *cont* cont)
- (set! *frame* (last-stack-frame cont))
- (set! *depth* (stack-length (make-stack cont)))
- (set! *expr* #f)
- (set! *retval* retval)
- (set! *trace-entry* #f)
- (set! *trace-retval* #f)
- (set! *debug-flag* #f)
- (set! *debug-entry-messages* '())))
-
-(define (debug-if-flag-set)
- (if *debug-flag*
- (let ((ds-flags (cons #:continuable
- (if (eq? *trap* #:return)
- (list *trap* *retval*)
- (list *trap*)))))
- (for-each (lambda (msg)
- (display msg (debugger-output-port)))
- (reverse! *debug-entry-messages*))
- (set! *debug-entry-messages* '())
- (apply debug-stack (make-stack *cont*) ds-flags))))
-
-(add-hook! after-enter-frame-hook debug-if-flag-set)
-
-(add-hook! after-apply-frame-hook debug-if-flag-set)
-
-(add-hook! after-exit-frame-hook
- (lambda ()
- (if *trace-retval*
- (with-output-to-port (debugger-output-port)
- (lambda ()
- (let indent ((td *trace-depths*))
- (cond ((null? td))
- (else (display "| ")
- (indent (cdr td)))))
- (display "| ")
- (write *retval*)
- (newline)
- (set! *trace-retval* #f))))
- (debug-if-flag-set)))
-
-(define (frame-depth frame)
- (- (stack-length (car frame)) (cdr frame)))
-
-(define (with-reference-frame* frame thunk)
- (let ((saved-*frame* *frame*)
- (saved-*depth* *depth*))
- (dynamic-wind
- (lambda ()
- (set! *frame* frame)
- (set! *depth* (frame-depth frame)))
- thunk
- (lambda ()
- (set! *frame* saved-*frame*)
- (set! *depth* saved-*depth*)))))
-
-(define-macro (with-reference-frame frame . body)
- `(with-reference-frame* ,frame (lambda () ,@body)))
-
-;;; at-exit THUNK
-;;;
-;;; Install a thunk to run when we exit the current frame.
-
-(define* (at-exit #:optional thunk)
- (or thunk (set! thunk debug-here))
- (let ((depth *depth*))
- (letrec ((exit (lambda ()
- (if (<= *depth* depth)
- (begin
- (remove-exit-frame-hook! exit)
- (thunk))))))
- (add-exit-frame-hook! exit))))
-
-;;; at-entry [COUNT [THUNK]]
-;;;
-;;; Install a thunk to run when we get to the COUNT'th next frame
-;;; entry. COUNT defaults to 1; THUNK defaults to debug-here.
-
-(define* (at-entry #:optional count thunk)
- (or count (set! count 1))
- (or thunk (set! thunk debug-here))
- (letrec ((enter (lambda ()
- (set! count (- count 1))
- (if (<= count 0)
- (begin
- (remove-enter-frame-hook! enter)
- (thunk))))))
- (add-enter-frame-hook! enter)))
-
-;;; at-apply [COUNT [THUNK]]
-;;;
-;;; Install a thunk to run when we get to the COUNT'th next
-;;; application. COUNT defaults to 1; THUNK defaults to debug-here.
-
-(define* (at-apply #:optional count thunk)
- (or count (set! count 1))
- (or thunk (set! thunk debug-here))
- (letrec ((apply (lambda ()
- (set! count (- count 1))
- (if (<= count 0)
- (begin
- (remove-apply-frame-hook! apply)
- (thunk))))))
- (add-apply-frame-hook! apply)))
-
-;;; at-step [COUNT [THUNK [FILENAME]]]
-;;;
-;;; Install THUNK to run on the COUNT'th next application, frame entry
-;;; or frame exit. COUNT defaults to 1; THUNK defaults to debug-here.
-;;; If FILENAME is specified and not #f, only frames that begin in the
-;;; named file are counted.
-
-(define* (at-step #:optional count thunk filename)
- (or count (set! count 1))
- (or thunk (set! thunk debug-here))
- (letrec ((proc (lambda ()
- ;; Behaviour whenever we enter or exit a frame.
- (set! count (- count 1))
- (if (= count 0)
- (begin
- (remove-enter-frame-hook! step)
- (remove-apply-frame-hook! step)
- (thunk)))))
- (step (lambda ()
- ;; Behaviour on frame entry: both execute the above
- ;; and install it as an exit hook.
- (if (or (not filename)
- (equal? (current-file-name) filename))
- (begin
- (proc)
- (at-exit proc))))))
- (at-exit proc)
- (add-enter-frame-hook! step)
- (add-apply-frame-hook! step)))
-
-;;; at-next [COUNT [THUNK]]
-;;;
-;;; Install a thunk to run when we get to the COUNT'th next frame
-;;; entry in the same source file as the current location. COUNT
-;;; defaults to 1; THUNK defaults to debug-here. If the current
-;;; location has no filename, fall back silently to `at-entry'
-;;; behaviour.
-
-(define (current-file-name)
- (and-let* ((source (frame-source *frame*))
- (position (source-position source)))
- (and position (car position))))
-
-(define* (at-next #:optional count thunk)
- (at-step count thunk (current-file-name)))
-
-;;; debug-here
-;;;
-;;; Set flag to enter the debugger once all behaviour hooks for this
-;;; location have been run.
-
-(define (debug-here)
- (set! *debug-flag* #t))
-
-;;; trace-here
-;;;
-;;; Trace the current location, and install a hook to trace the return
-;;; value when we exit the current frame.
-
-(define (trace-here)
- (if *trace-entry*
- (let ((stack (make-stack *cont*))
- (push-current-depth #f))
- (cond ((null? *trace-depths*)
- (set! push-current-depth #t))
- (else
- (let loop ((frame-number (car *trace-depths*)))
- (cond ((>= frame-number *depth*))
- ((frame-real? (stack-ref stack
- (frame-number->index frame-number stack)))
- (set! push-current-depth #t))
- (else (loop (+ frame-number 1)))))))
- (if push-current-depth
- (set! *trace-depths* (cons *depth* *trace-depths*)))
- (with-output-to-port (debugger-output-port)
- (lambda ()
- (let indent ((td *trace-depths*))
- (cond ((null? td))
- (else
- (display "| ")
- (indent (cdr td)))))
- ((if *expr*
- write-frame-short/expression
- write-frame-short/application) *frame*)
- (newline)))
- (if push-current-depth
- (at-exit (lambda ()
- (set! *trace-depths* (cdr *trace-depths*))
- (set! *trace-retval* #t))))
- (set! *trace-entry* #f))))
-
-;;; trace-subtree
-;;;
-;;; Install hooks to trace everything until exit from the current
-;;; frame. Variable lookups are omitted, as they would (usually) just
-;;; clog up the trace without conveying any useful information
-
-(define (trace-until-exit)
- (let ((trace (lambda ()
- (or (variable? *expr*)
- (trace-here)))))
- (add-enter-frame-hook! trace)
- (add-apply-frame-hook! trace)
- (at-exit (lambda ()
- (remove-enter-frame-hook! trace)
- (remove-apply-frame-hook! trace)))))
-
-(define (trace-subtree)
- (trace-until-exit)
- (trace-here))
-
-;;; trace-exit-value
-;;;
-;;; Trace the returned value in an exit frame handler.
-
-(define (trace-exit-value)
- (set! *trace-retval* #t))
-
-;;; {Debug Entry Messages}
-;;;
-;;; Messages to be displayed if we decide to enter the debugger.
-
-(define *debug-entry-messages* '())
-
-(define (add-debug-entry-message message)
- (set! *debug-entry-messages*
- (cons message *debug-entry-messages*)))
-
-;;; {Error Hook Utilities}
-
-;(define (single-instance-installer hook handler)
-; (let ((installed? #f))
-; (lambda (yes/no?)
-; (if (and yes/no? (not installed?))
-; (begin
-; (add-hook! hook handler)
-; (set! installed? #t)))
-; (if (and (not yes/no?) installed?)
-; (begin
-; (remove-hook! hook handler)
-; (set! installed? #f))))))
-;
-;(define-public save-stack-on-error
-; (letrec ((handler (lambda (key a b c d)
-; (save-stack handler))))
-; (single-instance-installer error-hook handler)))
-;
-;(define-public display-stack-on-error
-; (letrec ((handler (lambda (key a b c d)
-; (display "DISPLAY-STACK-ON-ERROR: ")
-; (write (list key a b c d))
-; (newline)
-; (display-backtrace (make-stack #t handler)
-; (current-error-port)))))
-; (single-instance-installer error-hook handler)))
-;
-;(define-public debug-on-error
-; (letrec ((handler (lambda (key a b c d)
-; (let ((stack (make-stack #t handler)))
-; (display "DEBUG-ON-ERROR: ")
-; (write (list key a b c d))
-; (newline)
-; (display-error stack (current-error-port) a b c d)
-; (debug-stack stack)))))
-; (single-instance-installer error-hook handler)))
-
-;;; (ice-9 debugger behaviour) ends here.
diff --git a/ice-9/debugger/breakpoints.scm b/ice-9/debugger/breakpoints.scm
index db612daf5..e69de29bb 100644
--- a/ice-9/debugger/breakpoints.scm
+++ b/ice-9/debugger/breakpoints.scm
@@ -1,215 +0,0 @@
-;;;; (ice-9 debugger breakpoints) -- general breakpoints interface
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (ice-9 debugger breakpoints)
- #:use-module (ice-9 debugger behaviour)
- #:use-module (ice-9 format)
- #:use-module (oop goops)
- #:export (;; For <breakpoint> subclass implementations.
- <breakpoint>
- register-breakpoint-subclass
- ;; For application use and subclass implementations.
- bp-number
- bp-enabled?
- bp-behaviour
- bp-run
- bp-message
- bp-delete!
- bp-describe
- break!
- trace!
- trace-subtree!
- set-breakpoint!
- get-breakpoint
- describe-breakpoint
- disable-breakpoint!
- enable-breakpoint!
- delete-breakpoint!
- all-breakpoints
- describe-all-breakpoints))
-
-;;; {Breakpoints -- General Properties and Behaviour}
-
-;;; Generics with names beginning `bp-' all take a single breakpoint
-;;; argument (i.e. an instance of a subclass of <breakpoint>).
-
-(define-generic bp-number) ; implemented
-(define-generic bp-enabled?) ; implemented
-(define-generic bp-behaviour) ; implemented
-(define-generic bp-run) ; implemented
-(define-generic bp-message) ; virtual
-(define-generic bp-delete!) ; virtual
-(define-generic bp-describe) ; implemented
-
-;;; The following all take arguments that describe (in whatever way
-;;; the various subclasses support) a breakpoint location. The
-;;; <breakpoint> implementations of `break!' and `trace!' just call
-;;; `set-breakpoint!' specifying the `debug-here' and `trace-here'
-;;; behaviours respectively.
-
-(define-generic set-breakpoint!) ; semi-virtual
-(define-generic get-breakpoint) ; semi-virtual
-
-;;; Common base class for breakpoints.
-
-(define-class <breakpoint> ()
-
- ;; Breakpoint number.
- (number #:accessor bp-number
- #:init-thunk (let ((count 0))
- (lambda ()
- (set! count (+ count 1))
- count)))
-
- ;; Whether this breakpoint is currently enabled.
- (enabled? #:accessor bp-enabled?
- #:init-value #t)
-
- ;; Breakpoint behaviour, either a list of behaviour indicators, or a
- ;; thunk that, when called, returns such a list.
- (behaviour #:accessor bp-behaviour
- #:init-value '()))
-
-;;; Registration of <breakpoint> subclasses. The only current reason
-;;; for this is so that we can provide `all-breakpoints'.
-
-(define subclass-registrations '())
-
-(define (register-breakpoint-subclass class list-thunk)
- ;; LIST-THUNK should be a thunk that returns a list containing all
- ;; current breakpoints of the corresponding class.
- (set! subclass-registrations
- (assq-set! subclass-registrations class list-thunk)))
-
-(define (all-breakpoints)
- (sort (apply append
- (map (lambda (list-thunk) (list-thunk))
- (map cdr subclass-registrations)))
- (lambda (bp1 bp2)
- (< (bp-number bp1) (bp-number bp2)))))
-
-(define (describe-all-breakpoints)
- (for-each (lambda (bp)
- (bp-describe bp #t))
- (all-breakpoints)))
-
-(define-method (get-breakpoint (number <integer>))
- (let loop ((bps (all-breakpoints)))
- (if (null? bps)
- #f
- (let* ((bp (car bps))
- (bp-num (bp-number bp)))
- (cond ((= bp-num number) bp)
- ((> bp-num number) #f)
- (else (loop (cdr bps))))))))
-
-(define (make-breakpoint-command proc)
- (lambda args
- (let ((bp (apply get-breakpoint args)))
- (if bp
- (proc bp)
- (display "Breakpoint not found\n")))))
-
-(define describe-breakpoint
- (make-breakpoint-command (lambda (bp)
- (bp-describe bp #t))))
-
-(define disable-breakpoint!
- (make-breakpoint-command (lambda (bp)
- (set! (bp-enabled? bp) #f)
- (bp-describe bp #t))))
-
-(define enable-breakpoint!
- (make-breakpoint-command (lambda (bp)
- (set! (bp-enabled? bp) #t)
- (bp-describe bp #t))))
-
-(define delete-breakpoint!
- (make-breakpoint-command bp-delete!))
-
-(define-method (set-breakpoint! behaviour (number <integer>))
- (let ((bp (get-breakpoint number)))
- (if bp
- (begin
- (set! (bp-behaviour bp) behaviour)
- (bp-describe bp #t))
- (display "No such breakpoint\n"))))
-
-;;; `bp-run' is what trap hook functions should call when they
-;;; establish that the program is at a breakpoint location.
-
-(define-method (bp-run (bp <breakpoint>))
- ;; Only do anything if the breakpoint is enabled.
- (add-debug-entry-message (bp-message bp "Hit breakpoint" #f))
- (if (bp-enabled? bp)
- ;; Get behaviour for this breakpoint.
- (let ((behaviour (bp-behaviour bp)))
- ;; Behaviour should be a thunk or a list of thunks.
- (cond ((thunk? behaviour)
- (behaviour))
- ((list? behaviour)
- (for-each (lambda (thunk) (thunk)) behaviour))
- (else
- (bp-message bp "Bad behaviour for breakpoint" #t)))
-; (if (thunk? behaviour)
-; (set! behaviour (behaviour)))
-; ;; If not a list, wrap as a list.
-; (or (list? behaviour)
-; (set! behaviour (list behaviour)))
-; ;; If behaviour indicates tracing, do so.
-; (if (memq #:trace behaviour)
-; (trace-here))
-; ;; If behaviour indicates a thunk to be run when we exit the
-; ;; current frame, register it.
-; (let ((at-exit (memq #:at-exit behaviour)))
-; (if (and at-exit (not (null? (cdr at-exit))))
-; (set-at-exit (cadr at-exit))))
-; ;; If behaviour indicates interactive debugging, set flag that
-; ;; will cause us to enter the debugger.
-; (if (memq #:debug behaviour)
-; (begin
-; (bp-message "Hit breakpoint" bp)
-; (debug-here)))
- )))
-
-;;; `break! ...' is just shorthand for `set-breakpoint! debug-here ...'.
-
-(define (break! . args)
- (apply set-breakpoint! debug-here args))
-
-;;; Similarly `trace! ...' and `set-breakpoint! trace-here ...'.
-
-(define (trace! . args)
- (apply set-breakpoint! trace-here args))
-
-;;; And so on.
-
-(define (trace-subtree! . args)
- (apply set-breakpoint! trace-subtree args))
-
-;;; `bp-describe' is expected to be overridden/extended by subclasses,
-;;; but subclass implementations may want to leverage this
-;;; implementation by beginning with `(next-method)'.
-
-(define-method (bp-describe (bp <breakpoint>) port)
- (bp-message bp "Breakpoint" port)
- (format port "\tenabled? = ~S\n" (bp-enabled? bp))
- (format port "\tbehaviour = ~S\n" (bp-behaviour bp))
- *unspecified*)
-
-;;; (ice-9 debugger breakpoints) ends here.
diff --git a/ice-9/debugger/breakpoints/Makefile.am b/ice-9/debugger/breakpoints/Makefile.am
index e28c672a0..e69de29bb 100644
--- a/ice-9/debugger/breakpoints/Makefile.am
+++ b/ice-9/debugger/breakpoints/Makefile.am
@@ -1,28 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE 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.
-##
-## GUILE 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 GUILE; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-## Boston, MA 02111-1307 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/ice-9/debugger/breakpoints
-subpkgdata_DATA = procedural.scm range.scm source.scm
-
-TAGS_FILES = $(subpkgdata_DATA)
-EXTRA_DIST = $(subpkgdata_DATA)
diff --git a/ice-9/debugger/breakpoints/procedural.scm b/ice-9/debugger/breakpoints/procedural.scm
index 8668d1678..e69de29bb 100644
--- a/ice-9/debugger/breakpoints/procedural.scm
+++ b/ice-9/debugger/breakpoints/procedural.scm
@@ -1,103 +0,0 @@
-;;;; (ice-9 debugger breakpoints procedural) -- procedural breakpoints
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (ice-9 debugger breakpoints procedural)
- #:use-module (ice-9 format)
- #:use-module (oop goops)
- #:use-module (ice-9 debugger breakpoints)
- #:use-module (ice-9 debugger trc)
- #:use-module (ice-9 debugger trap-hooks)
- #:export (<procedure-breakpoint>
- bp-procedure))
-
-;;; {Procedure Breakpoints}
-;;;
-;;; Breakpoints that activate upon application of a particular
-;;; procedure.
-
-(define-generic bp-procedure)
-(define-generic bp-hook)
-
-(define-class <procedure-breakpoint> (<breakpoint>)
-
- ;; The procedure to which this breakpoint applies.
- (procedure #:accessor bp-procedure
- #:init-keyword #:procedure)
-
- ;; The procedure that is registered as a trace hook for this
- ;; breakpoint, stored here so that we can easily deregister it.
- (hook #:accessor bp-hook))
-
-(define (nameify proc)
- (or (procedure-name proc) proc))
-
-(define-method (bp-message (bp <procedure-breakpoint>) message port)
- (format port
- "~A ~A: [~A]\n"
- message
- (bp-number bp)
- (nameify (bp-procedure bp))))
-
-;;; Alist of all procedure breakpoints:
-;;; ((PROCEDURE . BREAKPOINT) ...)
-;;; Keys are unique according to `eq?'.
-(define procedure-breakpoints '())
-
-(define-method (get-breakpoint (proc <procedure>))
- (assq-ref procedure-breakpoints proc))
-
-(define *proc* #f)
-
-(add-hook! before-apply-frame-hook
- (lambda (cont tail?)
- (trc 'before-apply-frame-hook tail?)
- ;(set! *expr* #f)
- (set! *proc* (frame-procedure (last-stack-frame cont)))))
-
-(define (add-breakpoint proc)
- (let* ((bp (make <procedure-breakpoint> #:procedure proc))
- (hook (lambda ()
- (if (eq? proc *proc*)
- (bp-run bp)))))
- (set-procedure-property! proc 'trace #t)
- (set! (bp-hook bp) hook)
- (add-trace-hook! hook)
- (set! procedure-breakpoints (assq-set! procedure-breakpoints proc bp))
- bp))
-
-(define-method (set-breakpoint! behaviour (proc <procedure>))
- (let ((bp (or (get-breakpoint proc)
- (add-breakpoint proc))))
- (set! (bp-behaviour bp) behaviour)
- (bp-message bp "Set breakpoint" #t)
- bp))
-
-(define-method (bp-delete! (bp <procedure-breakpoint>))
- (let ((proc (bp-procedure bp)))
- (set! procedure-breakpoints
- (assq-remove! procedure-breakpoints proc))
- (set-procedure-property! proc 'trace #f)
- (remove-trace-hook! (bp-hook bp))
- (bp-message bp "Deleted breakpoint" #t))
- *unspecified*)
-
-(register-breakpoint-subclass <procedure-breakpoint>
- (lambda ()
- (map cdr procedure-breakpoints)))
-
-;;; (ice-9 debugger breakpoints procedure) ends here.
diff --git a/ice-9/debugger/breakpoints/range.scm b/ice-9/debugger/breakpoints/range.scm
index 1e4202511..e69de29bb 100644
--- a/ice-9/debugger/breakpoints/range.scm
+++ b/ice-9/debugger/breakpoints/range.scm
@@ -1,192 +0,0 @@
-;;;; (ice-9 debugger breakpoints range) -- experimental range breakpoints
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (ice-9 debugger breakpoints range)
- #:use-module (ice-9 debugger breakpoints)
- #:use-module (ice-9 debugger trap-hooks)
- #:use-module (ice-9 debugger trc)
- #:use-module (ice-9 debugger utils)
- #:use-module (ice-9 format)
- #:use-module (oop goops)
- #:export (<range-breakpoint>
- bp-range))
-
-;;; {Range Breakpoints}
-;;;
-;;; Breakpoints that activate upon entry to a frame whose source lies
-;;; in a specified range.
-
-(define-generic bp-range)
-
-(define-class <range-breakpoint> (<breakpoint>)
-
- ;; The range of this breakpoint.
- (range #:accessor bp-range #:init-keyword #:range))
-
-(define (range->string filename from-line from-column to-line to-column)
- (if (positive? from-line)
- (format #f "~A:~A:~A-~A:~A" filename
- (+ from-line 1) (+ from-column 1)
- (+ to-line 1) (+ to-column 1))
- (format #f "~A (whole file)" filename)))
-
-(define-method (bp-message (bp <range-breakpoint>) message port)
- (format port
- "~A ~A: ~A\n"
- message
- (bp-number bp)
- (apply range->string (bp-range bp))))
-
-;;; Alist of all range breakpoints:
-;;; ((RANGE . BREAKPOINT) ...)
-;;; where RANGE is
-;;; (FILE-NAME FROM-LINE FROM-COLUMN TO-LINE TO-COLUMN)
-;;; Keys are unique according to `equal?'.
-
-(define range-breakpoints '())
-
-(define-method (get-breakpoint (filename <string>)
- (from-line <integer>)
- (from-column <integer>)
- (to-line <integer>)
- (to-column <integer>))
- (assoc-ref range-breakpoints
- (if (positive? from-line)
- (list filename
- (- from-line 1)
- (- from-column 1)
- (- to-line 1)
- (- to-column 1))
- (list filename 0 0 0 0))))
-
-(define-method (get-breakpoint (filename <string>))
- (get-breakpoint filename 0 0 0 0))
-
-(define-method (get-breakpoint (filename <string>)
- (line <integer>))
- (get-breakpoint filename line 1 (+ line 1) 1))
-
-(define-method (get-breakpoint (filename <string>)
- (from-line <integer>)
- (to-line <integer>))
- (get-breakpoint filename from-line 1 to-line 1))
-
-(define (add-breakpoint filename from-line from-column to-line to-column)
- (let* ((range (if (positive? from-line)
- (list filename
- (- from-line 1)
- (- from-column 1)
- (- to-line 1)
- (- to-column 1))
- (list filename 0 0 0 0)))
- (bp (make <range-breakpoint> #:range range)))
- (set! range-breakpoints (assoc-set! range-breakpoints range bp))
- (remove/install-range-breakpoint-hooks)
- bp))
-
-(define-method (set-breakpoint! behaviour
- (filename <string>)
- (from-line <integer>)
- (from-column <integer>)
- (to-line <integer>)
- (to-column <integer>))
- (let ((bp (or (get-breakpoint filename from-line from-column to-line to-column)
- (add-breakpoint filename from-line from-column to-line to-column))))
- (set! (bp-behaviour bp) behaviour)
- (bp-message bp "Set breakpoint" #t)
- bp))
-
-(define-method (set-breakpoint! behaviour
- (filename <string>))
- (set-breakpoint! behaviour filename 0 0 0 0))
-
-(define-method (set-breakpoint! behaviour
- (filename <string>)
- (line <integer>))
- (set-breakpoint! behaviour filename line 1 (+ line 1) 1))
-
-(define-method (set-breakpoint! behaviour
- (filename <string>)
- (from-line <integer>)
- (to-line <integer>))
- (set-breakpoint! behaviour filename from-line 1 to-line 1))
-
-(define remove/install-range-breakpoint-hooks
- (let ((hooks-installed? #f))
- (lambda ()
- (cond ((and hooks-installed?
- (null? range-breakpoints))
- (remove-hook! before-enter-frame-hook
- range-before-enter-frame-hook)
- (remove-enter-frame-hook! range-enter-frame-hook)
- (set! hooks-installed? #f))
- ((and (not hooks-installed?)
- (not (null? range-breakpoints)))
- (add-hook! before-enter-frame-hook
- range-before-enter-frame-hook)
- (add-enter-frame-hook! range-enter-frame-hook)
- (set! hooks-installed? #t))))))
-
-(define *cont* #f)
-
-(define (range-before-enter-frame-hook cont . ignored)
- (trc 'range-before-enter-frame-hook)
- (set! *cont* cont))
-
-(define (range-enter-frame-hook)
- (trc 'range-enter-frame-hook)
- (let* ((frame (last-stack-frame *cont*))
- (source (frame-source frame))
- (position (and source (source-position source))))
- (if position
- (for-each (lambda (range bp)
- (if (apply position-in-range position range)
- (bp-run bp)))
- (map car range-breakpoints)
- (map cdr range-breakpoints)))))
-
-(define (position-in-range position
- filename
- from-line
- from-column
- to-line
- to-column)
- (and (string=? (car position) filename)
- (if (positive? from-line)
- (let ((pline (cadr position))
- (pcolumn (caddr position)))
- (and (or (and (= pline from-line)
- (>= pcolumn from-column))
- (> pline from-line))
- (or (and (= pline to-line)
- (< pcolumn to-column))
- (< pline to-line))))
- #t)))
-
-(define-method (bp-delete! (bp <range-breakpoint>))
- (set! range-breakpoints
- (assoc-remove! range-breakpoints (bp-range bp)))
- (remove/install-range-breakpoint-hooks)
- (bp-message bp "Deleted breakpoint" #t)
- *unspecified*)
-
-(register-breakpoint-subclass <range-breakpoint>
- (lambda ()
- (map cdr range-breakpoints)))
-
-;;; (ice-9 debugger breakpoints range) ends here.
diff --git a/ice-9/debugger/breakpoints/source.scm b/ice-9/debugger/breakpoints/source.scm
index fde746733..e69de29bb 100644
--- a/ice-9/debugger/breakpoints/source.scm
+++ b/ice-9/debugger/breakpoints/source.scm
@@ -1,244 +0,0 @@
-;;;; (ice-9 debugger breakpoints source) -- source location breakpoints
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-(define-module (ice-9 debugger breakpoints source)
- #:use-module (ice-9 format)
- #:use-module (ice-9 debugger breakpoints)
- #:use-module (ice-9 debugger trap-hooks)
- #:use-module (ice-9 debugger trc)
- #:use-module (ice-9 debugger utils)
- #:use-module (oop goops)
- #:export (<source-breakpoint>
- bp-location
- bp-expression))
-
-;;; {Source Breakpoints}
-;;;
-;;; Breakpoints that activate upon reaching a particular source
-;;; location or range of source locations.
-
-(define-generic bp-location)
-(define-generic bp-expression)
-
-(define-class <source-breakpoint> (<breakpoint>)
-
- ;; The location of this breakpoint.
- (location #:accessor bp-location
- #:init-keyword #:location)
-
- ;; The source expression at this breakpoint.
- (expression #:accessor bp-expression
- #:init-keyword #:expression)
-
- ;; Counter: incremented when the breakpoint is set, decremented when
- ;; a source expression using this breakpoint applied has been GC'd.
- (use-count #:accessor bp-use-count
- #:init-value 0))
-
-(define (location->string filename line column)
- (format #f "~A:~A:~A" filename (+ line 1) (+ column 1)))
-
-(define-method (bp-message (bp <source-breakpoint>) message port)
- (format port
- "~A ~A: ~A: ~S\n"
- message
- (bp-number bp)
- (apply location->string (bp-location bp))
- (bp-expression bp)))
-
-(define-method (bp-describe (bp <source-breakpoint>) port)
- (next-method)
- (if (zero? (bp-use-count bp))
- (format port "\t(this breakpoint is a zombie)\n"))
- *unspecified*)
-
-;;; Alist of all source breakpoints:
-;;; ((LOCATION . BREAKPOINT) ...)
-;;; where LOCATION is
-;;; (FILE-NAME LINE COLUMN)
-;;; Keys are unique according to `equal?'.
-
-(define source-breakpoints '())
-
-(define-method (get-breakpoint (filename <string>)
- (line <integer>)
- (column <integer>))
- (assoc-ref source-breakpoints (list filename line column)))
-
-;;; When the source expression that a breakpoint is attached to is
-;;; GC'd, typically because the variable that included it in its value
-;;; has been redefined, we'd like to mark the breakpoint as no longer
-;;; relevant. We do this by using a property guardian ...
-
-(define (make-property-guardian)
- ;; Return a new property guardian. A property guardian is a
- ;; combination of a guardian and an object property that accepts KEY
- ;; -> VALUE associations and gives you back the VALUE when its KEY
- ;; has been garbage collected.
- ;;
- ;; To store an association, call it in the same way as you would an
- ;; object property: (set! (PROPERTY-GUARDIAN KEY) VALUE).
- ;;
- ;; To retrieve the VALUE for a KEY that has been GC'd, call the
- ;; property guardian in the same way as you would a guardian, with
- ;; no args: (PROPERTY-GUARDIAN).
- (let ((p (make-object-property))
- (g (make-guardian)))
- (make-procedure-with-setter
- (lambda ()
- (let ((collected (g)))
- (and collected (car collected))))
- (lambda (key value)
- (let ((collectible (list value)))
- ;; Store the collectible value both as an object property,
- ;; and in the guardian.
- (set! (p key) collectible)
- (g collectible))))))
-
-(define source-breakpoint-guardian (make-property-guardian))
-
-(add-hook! after-gc-hook
- (lambda ()
- (let loop ((bp (source-breakpoint-guardian)))
- (if bp
- (let ((new-use-count (- (bp-use-count bp) 1)))
- (set! (bp-use-count bp) new-use-count)
- (if (zero? new-use-count)
- (bp-message bp "Zombified breakpoint" #t))
- (loop (source-breakpoint-guardian)))))))
-
-(define (add-breakpoint filename line column expression)
- (let* ((location (list filename line column))
- (bp (make <source-breakpoint>
- #:location location
- #:expression (if (pair? expression)
- ;; The point of this strange looking
- ;; copy is to copy the expression
- ;; without its source properties.
- ;; This is necessary to allow the
- ;; source properties to be GC'd when
- ;; the source expression becomes
- ;; obsolete. (Note that `copy-tree'
- ;; copies source properties as well!)
- (cons (car expression) (cdr expression))
- expression))))
- (set! source-breakpoints (assoc-set! source-breakpoints location bp))
- bp))
-
-(define-method (set-breakpoint! behaviour
- x-as-read
- (x-pairified <pair>))
- (let ((filename (source-property x-pairified 'filename))
- (line (source-property x-pairified 'line))
- (column (source-property x-pairified 'column)))
- (let ((bp (or (get-breakpoint filename line column)
- (add-breakpoint filename line column x-as-read))))
- (set! (bp-behaviour bp) behaviour)
- (install-breakpoint x-pairified bp)
- (bp-message bp "Set breakpoint" #t)
- bp)))
-
-(define (install-breakpoint x bp)
- ;; Make the necessary connections with the specified expression and
- ;; its breakpoint.
- (set-source-property! x 'breakpoint #t)
- (set! (source-breakpoint-guardian x) bp)
- (set! (bp-use-count bp) (+ (bp-use-count bp) 1))
- (remove/install-source-breakpoint-hooks))
-
-(define remove/install-source-breakpoint-hooks
- (let ((hooks-installed? #f))
- (lambda ()
- (cond ((and hooks-installed?
- (null? source-breakpoints))
- (remove-hook! before-enter-frame-hook
- source-before-enter-frame-hook)
- (remove-breakpoint-hook! source-breakpoint-hook)
- (set! hooks-installed? #f))
- ((and (not hooks-installed?)
- (not (null? source-breakpoints)))
- (add-hook! before-enter-frame-hook
- source-before-enter-frame-hook)
- (add-breakpoint-hook! source-breakpoint-hook)
- (set! hooks-installed? #t))))))
-
-(define *cont* #f)
-
-(define (source-before-enter-frame-hook cont . ignored)
- (trc 'source-before-enter-frame-hook)
- (set! *cont* cont))
-
-(define (source-breakpoint-hook)
- (trc 'source-breakpoint-hook)
- (let* ((frame (last-stack-frame *cont*))
- (source (frame-source frame))
- (position (and source (source-position source)))
- (bp (and position (apply get-breakpoint position))))
- (if bp
- (bp-run bp))))
-
-(define-method (bp-delete! (bp <source-breakpoint>))
- (set! source-breakpoints (assoc-remove! source-breakpoints (bp-location bp)))
- (remove/install-source-breakpoint-hooks)
- (bp-message bp "Deleted breakpoint" #t)
- *unspecified*)
-
-(register-breakpoint-subclass <source-breakpoint>
- (lambda ()
- (map cdr source-breakpoints)))
-
-(read-hash-extend #\#
- (lambda (c port)
- (let (;; Save off port coordinates before reading
- ;; the following expression, as we'll need
- ;; to install source coordinates by hand if
- ;; the expression turns out not to be a
- ;; pair.
- (filename (port-filename port))
- (line (port-line port))
- (column (port-column port)))
- ;; Now read the marked expression.
- (let* ((x (read port))
- (x' (if (pair? x)
- x
- ;; The marked expression isn't a
- ;; pair, so it can't carry source
- ;; properties by itself.
- ;; Therefore we pretend instead
- ;; to have read `(begin X)', and
- ;; attach coordinate and
- ;; breakpoint information to the
- ;; begin expression.
- (let ((x' (list begin x)))
- (set-source-property! x' 'filename
- filename)
- (set-source-property! x' 'line
- line)
- (set-source-property! x' 'column
- column)
- x'))))
- ;; Don't allow breakpointed expression to have
- ;; a filename property that isn't a string.
- (or (string? filename)
- (set-source-property! x' 'filename "<unnamed port>"))
- (break! x x')
- x'))))
-
-(read-enable 'positions)
-
-;;; (ice-9 debugger breakpoints source) ends here.
diff --git a/ice-9/debugger/command-loop.scm b/ice-9/debugger/command-loop.scm
index 699ede765..08b79fb5b 100644
--- a/ice-9/debugger/command-loop.scm
+++ b/ice-9/debugger/command-loop.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 debugger command-loop)
#:use-module ((ice-9 debugger commands) :prefix debugger:)
diff --git a/ice-9/debugger/commands.scm b/ice-9/debugger/commands.scm
index b72e06ef6..1c8cb95c0 100644
--- a/ice-9/debugger/commands.scm
+++ b/ice-9/debugger/commands.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 debugger commands)
#:use-module (ice-9 debug)
diff --git a/ice-9/debugger/state.scm b/ice-9/debugger/state.scm
index 49e264a51..aa68314ee 100644
--- a/ice-9/debugger/state.scm
+++ b/ice-9/debugger/state.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 debugger state)
#:export (make-state
diff --git a/ice-9/debugger/trap-hooks.scm b/ice-9/debugger/trap-hooks.scm
index 77abc0df1..e69de29bb 100644
--- a/ice-9/debugger/trap-hooks.scm
+++ b/ice-9/debugger/trap-hooks.scm
@@ -1,320 +0,0 @@
-;;;; (ice-9 debugger trap-hooks) -- abstraction of libguile's traps interface
-
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
-;;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2.1 of the License, or (at your option) any later version.
-;;
-;; This library 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
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; This module provides an abstraction around Guile's low level trap
-;;; handler interface; its aim is to make the low level trap mechanism
-;;; shareable between the debugger and other applications, and to
-;;; insulate the rest of the debugger code a bit from changes that may
-;;; occur in the low level trap interface in future.
-
-(define-module (ice-9 debugger trap-hooks)
- #:use-module (ice-9 debugger trc)
- #:export (add-trapped-stack-id!
- remove-trapped-stack-id!
- before-apply-frame-hook
- before-enter-frame-hook
- before-exit-frame-hook
- after-apply-frame-hook
- after-enter-frame-hook
- after-exit-frame-hook
- add-apply-frame-hook!
- add-breakpoint-hook!
- add-enter-frame-hook!
- add-exit-frame-hook!
- add-trace-hook!
- remove-apply-frame-hook!
- remove-breakpoint-hook!
- remove-enter-frame-hook!
- remove-exit-frame-hook!
- remove-trace-hook!
- debug-hook-membership))
-
-;;; The current low level traps interface is as follows.
-;;;
-;;; All trap handlers are subject to SCM_TRAPS_P, which is controlled
-;;; by the `traps' setting of `(evaluator-traps-interface)' but also
-;;; (and more relevant in most cases) by the `with-traps' procedure.
-;;; Basically, `with-traps' sets SCM_TRAPS_P to 1 during execution of
-;;; its thunk parameter.
-;;;
-;;; Note that all trap handlers are called with SCM_TRAPS_P set to 0
-;;; for the duration of the call, to avoid nasty recursive trapping
-;;; loops. If a trap handler knows what it is doing, it can override
-;;; this by `(trap-enable traps)'.
-;;;
-;;; The apply-frame handler is called when Guile is about to perform
-;;; an application if EITHER the `apply-frame' evaluator trap option
-;;; is set, OR the `trace' debug option is set and the procedure to
-;;; apply has its `trace' procedure property set. The arguments
-;;; passed are:
-;;;
-;;; - the symbol 'apply-frame
-;;;
-;;; - a continuation or debug object describing the current stack
-;;;
-;;; - a boolean indicating whether the application is tail-recursive.
-;;;
-;;; The enter-frame handler is called when the evaluator begins a new
-;;; evaluation frame if EITHER the `enter-frame' evaluator trap option
-;;; is set, OR the `breakpoints' debug option is set and the code to
-;;; be evaluated has its `breakpoint' source property set. The
-;;; arguments passed are:
-;;;
-;;; - the symbol 'enter-frame
-;;;
-;;; - a continuation or debug object describing the current stack
-;;;
-;;; - a boolean indicating whether the application is tail-recursive.
-;;;
-;;; - an unmemoized copy of the expression to be evaluated.
-;;;
-;;; If the `enter-frame' evaluator trap option is set, the enter-frame
-;;; handler is also called when about to perform an application in
-;;; SCM_APPLY, immediately before possible calling the apply-frame
-;;; handler. (I don't totally understand this.) In this case, the
-;;; arguments passed are:
-;;;
-;;; - the symbol 'enter-frame
-;;;
-;;; - a continuation or debug object describing the current stack.
-;;;
-;;; The exit-frame handler is called when Guile exits an evaluation
-;;; frame (in SCM_CEVAL) or an application frame (in SCM_APPLY), if
-;;; EITHER the `exit-frame' evaluator trap option is set, OR the
-;;; `trace' debug option is set and the frame is marked as having been
-;;; traced. The frame will be marked as having been traced if the
-;;; apply-frame handler was called for this frame. (This is trickier
-;;; than it sounds because of tail recursion: the same debug frame
-;;; could have been used for multiple applications, only some of which
-;;; were traced - I think.) The arguments passed are:
-;;;
-;;; - the symbol 'exit-frame
-;;;
-;;; - a continuation or debug object describing the current stack
-;;;
-;;; - the result of the evaluation or application.
-
-;;; {Stack IDs}
-;;;
-;;; Mechanism for limiting trapping to contexts whose stack ID matches
-;;; one of a registered set. The default set up is to limit trapping
-;;; to events in the contexts of the Guile REPL and of file loading.
-
-(define trapped-stack-ids (list 'repl-stack 'load-stack))
-(define all-stack-ids-trapped? #f)
-
-(define (add-trapped-stack-id! id)
- "Add ID to the set of stack ids for which traps are active.
-If `#t' is in this set, traps are active regardless of stack context.
-To remove ID again, use `remove-trapped-stack-id!'. If you add the
-same ID twice using `add-trapped-stack-id!', you will need to remove
-it twice."
- (set! trapped-stack-ids (cons id trapped-stack-ids))
- (set! all-stack-ids-trapped? (memq #t trapped-stack-ids)))
-
-(define (remove-trapped-stack-id! id)
- "Remove ID from the set of stack ids for which traps are active."
- (set! trapped-stack-ids (delq1! id trapped-stack-ids))
- (set! all-stack-ids-trapped? (memq #t trapped-stack-ids)))
-
-(define (trap-here? cont)
- ;; Return true if the stack id of the specified continuation (or
- ;; debug object) is in the set that we should trap for; otherwise
- ;; false.
- (or all-stack-ids-trapped?
- (memq (stack-id cont) trapped-stack-ids)))
-
-;;; {Global State}
-;;;
-;;; Variables tracking registered handlers, relevant procedures, and
-;;; what's turned on as regards the evaluator's debugging options.
-
-(define before-enter-frame-hook (make-hook 3))
-(define enter-frame-hook (make-hook))
-(define breakpoint-hook (make-hook))
-(define after-enter-frame-hook (make-hook))
-
-(define before-exit-frame-hook (make-hook 2))
-(define exit-frame-hook (make-hook))
-(define after-exit-frame-hook (make-hook))
-
-(define before-apply-frame-hook (make-hook 2))
-(define apply-frame-hook (make-hook))
-(define trace-hook (make-hook))
-(define after-apply-frame-hook (make-hook))
-
-(define (hook-not-empty? hook)
- (not (hook-empty? hook)))
-
-(define set-debug-and-trap-options
- (let ((dopts (debug-options))
- (topts (evaluator-traps-interface))
- (setting (lambda (key opts)
- (let ((l (memq key opts)))
- (and l
- (not (null? (cdr l)))
- (cadr l)))))
- (debug-set-boolean! (lambda (key value)
- ((if value debug-enable debug-disable) key)))
- (trap-set-boolean! (lambda (key value)
- ((if value trap-enable trap-disable) key))))
- (let ((save-debug (memq 'debug dopts))
- (save-trace (memq 'trace dopts))
- (save-breakpoints (memq 'breakpoints dopts))
- (save-enter-frame (memq 'enter-frame topts))
- (save-apply-frame (memq 'apply-frame topts))
- (save-exit-frame (memq 'exit-frame topts))
- (save-enter-frame-handler (setting 'enter-frame-handler topts))
- (save-apply-frame-handler (setting 'apply-frame-handler topts))
- (save-exit-frame-handler (setting 'exit-frame-handler topts)))
- (lambda ()
- (let ((need-trace (hook-not-empty? trace-hook))
- (need-breakpoints (hook-not-empty? breakpoint-hook))
- (need-enter-frame (hook-not-empty? enter-frame-hook))
- (need-apply-frame (hook-not-empty? apply-frame-hook))
- (need-exit-frame (hook-not-empty? exit-frame-hook)))
- (debug-set-boolean! 'debug
- (or need-trace
- need-breakpoints
- need-enter-frame
- need-apply-frame
- need-exit-frame
- save-debug))
- (debug-set-boolean! 'trace
- (or need-trace
- save-trace))
- (debug-set-boolean! 'breakpoints
- (or need-breakpoints
- save-breakpoints))
- (trap-set-boolean! 'enter-frame
- (or need-enter-frame
- save-enter-frame))
- (trap-set-boolean! 'apply-frame
- (or need-apply-frame
- save-apply-frame))
- (trap-set-boolean! 'exit-frame
- (or need-exit-frame
- save-exit-frame))
- (trap-set! enter-frame-handler
- (cond ((or need-breakpoints
- need-enter-frame)
- enter-frame-handler)
- (else save-enter-frame-handler)))
- (trap-set! apply-frame-handler
- (cond ((or need-trace
- need-apply-frame)
- apply-frame-handler)
- (else save-apply-frame-handler)))
- (trap-set! exit-frame-handler
- (cond ((or need-exit-frame)
- exit-frame-handler)
- (else save-exit-frame-handler))))
- ;;(write (evaluator-traps-interface))
- *unspecified*))))
-
-(define (enter-frame-handler key cont . args)
- ;; For a non-application entry, ARGS is (TAIL? EXP), where EXP is an
- ;; unmemoized copy of the source expression. For an application
- ;; entry, ARGS is empty.
- (if (trap-here? cont)
- (let ((application-entry? (null? args)))
- (trc 'enter-frame-handler)
- (if application-entry?
- (run-hook before-enter-frame-hook cont #f #f)
- (run-hook before-enter-frame-hook cont (car args) (cadr args)))
- (run-hook enter-frame-hook)
- (or application-entry?
- (run-hook breakpoint-hook))
- (run-hook after-enter-frame-hook))))
-
-(define (exit-frame-handler key cont retval)
- (if (trap-here? cont)
- (begin
- (trc 'exit-frame-handler retval (stack-length (make-stack cont)))
- (run-hook before-exit-frame-hook cont retval)
- (run-hook exit-frame-hook)
- (run-hook after-exit-frame-hook))))
-
-(define (apply-frame-handler key cont tail?)
- (if (trap-here? cont)
- (begin
- (trc 'apply-frame-handler tail?)
- (run-hook before-apply-frame-hook cont tail?)
- (run-hook apply-frame-hook)
- (run-hook trace-hook)
- (run-hook after-apply-frame-hook))))
-
-(define-public (add-enter-frame-hook! proc)
- (add-hook! enter-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (add-breakpoint-hook! proc)
- (add-hook! breakpoint-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (add-exit-frame-hook! proc)
- (add-hook! exit-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (add-apply-frame-hook! proc)
- (add-hook! apply-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (add-trace-hook! proc)
- (add-hook! trace-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (remove-enter-frame-hook! proc)
- (remove-hook! enter-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (remove-breakpoint-hook! proc)
- (remove-hook! breakpoint-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (remove-exit-frame-hook! proc)
- (remove-hook! exit-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (remove-apply-frame-hook! proc)
- (remove-hook! apply-frame-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (remove-trace-hook! proc)
- (remove-hook! trace-hook proc)
- (set-debug-and-trap-options))
-
-(define-public (debug-hook-membership)
- (for-each (lambda (name+hook)
- (format #t "~A:\n" (car name+hook))
- (for-each (lambda (proc)
- (format #t " ~S\n" proc))
- (hook->list (cdr name+hook))))
- `((before-enter-frame-hook . ,before-enter-frame-hook)
- (enter-frame-hook . ,enter-frame-hook )
- (breakpoint-hook . ,breakpoint-hook )
- (after-enter-frame-hook . ,after-enter-frame-hook )
- (before-exit-frame-hook . ,before-exit-frame-hook )
- (exit-frame-hook . ,exit-frame-hook )
- (after-exit-frame-hook . ,after-exit-frame-hook )
- (before-apply-frame-hook . ,before-apply-frame-hook)
- (apply-frame-hook . ,apply-frame-hook )
- (trace-hook . ,trace-hook )
- (after-apply-frame-hook . ,after-apply-frame-hook ))))
-
-;;; (ice-9 debugger trap-hooks) ends here.
diff --git a/ice-9/debugger/trc.scm b/ice-9/debugger/trc.scm
index ded92cf7f..1b7c01cc8 100644
--- a/ice-9/debugger/trc.scm
+++ b/ice-9/debugger/trc.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 debugger trc)
#:export (trc trc-syms trc-all trc-none trc-add trc-remove trc-port))
diff --git a/ice-9/deprecated.scm b/ice-9/deprecated.scm
index 5f42b42ff..4297e5f1b 100644
--- a/ice-9/deprecated.scm
+++ b/ice-9/deprecated.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; Deprecated definitions.
diff --git a/ice-9/documentation.scm b/ice-9/documentation.scm
index 1ca66dc7c..c3a47cfa5 100644
--- a/ice-9/documentation.scm
+++ b/ice-9/documentation.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/emacs.scm b/ice-9/emacs.scm
index 751767549..cadacba70 100644
--- a/ice-9/emacs.scm
+++ b/ice-9/emacs.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; The author can be reached at djurfeldt@nada.kth.se
;;;; Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
diff --git a/ice-9/expect.scm b/ice-9/expect.scm
index b30b93d01..74901172c 100644
--- a/ice-9/expect.scm
+++ b/ice-9/expect.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/ftw.scm b/ice-9/ftw.scm
index d8e1e12b3..8e28865a0 100644
--- a/ice-9/ftw.scm
+++ b/ice-9/ftw.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;; Author: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/ice-9/gap-buffer.scm b/ice-9/gap-buffer.scm
index 298bcd4a3..c28367170 100644
--- a/ice-9/gap-buffer.scm
+++ b/ice-9/gap-buffer.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;;
;;; Author: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/ice-9/getopt-long.scm b/ice-9/getopt-long.scm
index 447b27915..04cfa918a 100644
--- a/ice-9/getopt-long.scm
+++ b/ice-9/getopt-long.scm
@@ -12,7 +12,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Russ McManus (rewritten by Thien-Thi Nguyen)
diff --git a/ice-9/hcons.scm b/ice-9/hcons.scm
index b6c0816ca..1c41e0fdf 100644
--- a/ice-9/hcons.scm
+++ b/ice-9/hcons.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/history.scm b/ice-9/history.scm
index 57f168c3f..69dc17771 100644
--- a/ice-9/history.scm
+++ b/ice-9/history.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; A simple value history support
diff --git a/ice-9/lineio.scm b/ice-9/lineio.scm
index e75e520e8..bb11bdf33 100644
--- a/ice-9/lineio.scm
+++ b/ice-9/lineio.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/list.scm b/ice-9/list.scm
index eaa19edac..2971d7676 100644
--- a/ice-9/list.scm
+++ b/ice-9/list.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 list)
:export (rassoc rassv rassq))
diff --git a/ice-9/ls.scm b/ice-9/ls.scm
index 8c204fef5..2571aaadc 100644
--- a/ice-9/ls.scm
+++ b/ice-9/ls.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 ls)
diff --git a/ice-9/mapping.scm b/ice-9/mapping.scm
index 4cdcffd55..06c35061c 100644
--- a/ice-9/mapping.scm
+++ b/ice-9/mapping.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/match.scm b/ice-9/match.scm
index a85daf36a..a5576d751 100644
--- a/ice-9/match.scm
+++ b/ice-9/match.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 match)
diff --git a/ice-9/networking.scm b/ice-9/networking.scm
index fa5352456..118c69cd9 100644
--- a/ice-9/networking.scm
+++ b/ice-9/networking.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define (gethostbyaddr addr) (gethost addr))
diff --git a/ice-9/null.scm b/ice-9/null.scm
index 8b1f6898d..4e6923542 100644
--- a/ice-9/null.scm
+++ b/ice-9/null.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; The null environment - only syntactic bindings
diff --git a/ice-9/occam-channel.scm b/ice-9/occam-channel.scm
index 5df6c1113..1873365e5 100644
--- a/ice-9/occam-channel.scm
+++ b/ice-9/occam-channel.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 occam-channel)
#:use-syntax (ice-9 syncase)
diff --git a/ice-9/optargs.scm b/ice-9/optargs.scm
index 966680924..40f052519 100644
--- a/ice-9/optargs.scm
+++ b/ice-9/optargs.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; Contributed by Maciej Stachowiak <mstachow@alum.mit.edu>
diff --git a/ice-9/poe.scm b/ice-9/poe.scm
index 2f3879b9e..3f54b56df 100644
--- a/ice-9/poe.scm
+++ b/ice-9/poe.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/popen.scm b/ice-9/popen.scm
index 542bdb33e..5a643e568 100644
--- a/ice-9/popen.scm
+++ b/ice-9/popen.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 popen)
diff --git a/ice-9/posix.scm b/ice-9/posix.scm
index 27aa7000b..1ec8b7bf2 100644
--- a/ice-9/posix.scm
+++ b/ice-9/posix.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define (stat:dev f) (vector-ref f 0))
diff --git a/ice-9/pretty-print.scm b/ice-9/pretty-print.scm
index ac6054a44..673da6517 100644
--- a/ice-9/pretty-print.scm
+++ b/ice-9/pretty-print.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 pretty-print)
:use-module (ice-9 optargs)
diff --git a/ice-9/psyntax.ss b/ice-9/psyntax.ss
index 8cf315800..a439d70a6 100644
--- a/ice-9/psyntax.ss
+++ b/ice-9/psyntax.ss
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/q.scm b/ice-9/q.scm
index edc653930..2602f7025 100644
--- a/ice-9/q.scm
+++ b/ice-9/q.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/r4rs.scm b/ice-9/r4rs.scm
index b17fc116c..6e93853a2 100644
--- a/ice-9/r4rs.scm
+++ b/ice-9/r4rs.scm
@@ -15,7 +15,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;; apply and call-with-current-continuation
diff --git a/ice-9/r5rs.scm b/ice-9/r5rs.scm
index 4c582d690..bd2b21242 100644
--- a/ice-9/r5rs.scm
+++ b/ice-9/r5rs.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; R5RS bindings
diff --git a/ice-9/rdelim.scm b/ice-9/rdelim.scm
index 95674ae68..e5b040cd6 100644
--- a/ice-9/rdelim.scm
+++ b/ice-9/rdelim.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/receive.scm b/ice-9/receive.scm
index 2fbed5fed..1b7bbdc87 100644
--- a/ice-9/receive.scm
+++ b/ice-9/receive.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (ice-9 receive)
:export (receive)
diff --git a/ice-9/regex.scm b/ice-9/regex.scm
index d6e666d91..04e2183c0 100644
--- a/ice-9/regex.scm
+++ b/ice-9/regex.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/runq.scm b/ice-9/runq.scm
index 196e7e04f..6cbbec6f5 100644
--- a/ice-9/runq.scm
+++ b/ice-9/runq.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/rw.scm b/ice-9/rw.scm
index ab1d1ad49..ba9baa8fc 100644
--- a/ice-9/rw.scm
+++ b/ice-9/rw.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/safe-r5rs.scm b/ice-9/safe-r5rs.scm
index 56036ca92..d6008e00b 100644
--- a/ice-9/safe-r5rs.scm
+++ b/ice-9/safe-r5rs.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; Safe subset of R5RS bindings
diff --git a/ice-9/safe.scm b/ice-9/safe.scm
index bd266b7b4..c5b6e15c8 100644
--- a/ice-9/safe.scm
+++ b/ice-9/safe.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; Safe subset of R5RS bindings
diff --git a/ice-9/serialize.scm b/ice-9/serialize.scm
index df69d4e42..b40c62619 100644
--- a/ice-9/serialize.scm
+++ b/ice-9/serialize.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/session.scm b/ice-9/session.scm
index 9dca7ab4b..514493f7f 100644
--- a/ice-9/session.scm
+++ b/ice-9/session.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/slib.scm b/ice-9/slib.scm
index e5b762383..22143c415 100644
--- a/ice-9/slib.scm
+++ b/ice-9/slib.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 slib)
:export (slib:load slib:load-source defmacro:load
diff --git a/ice-9/stack-catch.scm b/ice-9/stack-catch.scm
index 0533fbd77..3d3b963f6 100644
--- a/ice-9/stack-catch.scm
+++ b/ice-9/stack-catch.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 stack-catch)
diff --git a/ice-9/streams.scm b/ice-9/streams.scm
index 68e119ff8..6aabfb1a6 100644
--- a/ice-9/streams.scm
+++ b/ice-9/streams.scm
@@ -15,7 +15,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;; the basic stream operations are inspired by
;; (i.e. ripped off) Scheme48's `stream' package,
diff --git a/ice-9/string-fun.scm b/ice-9/string-fun.scm
index 8a154150f..52096f607 100644
--- a/ice-9/string-fun.scm
+++ b/ice-9/string-fun.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
(define-module (ice-9 string-fun)
diff --git a/ice-9/syncase.scm b/ice-9/syncase.scm
index 526cc2255..56f2995b6 100644
--- a/ice-9/syncase.scm
+++ b/ice-9/syncase.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/ice-9/test.scm b/ice-9/test.scm
index 902c7733b..956427aee 100644
--- a/ice-9/test.scm
+++ b/ice-9/test.scm
@@ -12,7 +12,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;;; "test.scm" Test correctness of scheme implementations.
;;; Author: Aubrey Jaffer
diff --git a/ice-9/threads.scm b/ice-9/threads.scm
index e71da9a0c..ba5c689df 100644
--- a/ice-9/threads.scm
+++ b/ice-9/threads.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
;;;; ----------------------------------------------------------------
;;;; threads.scm -- User-level interface to Guile's thread system
diff --git a/ice-9/time.scm b/ice-9/time.scm
index 261a8cd1a..950e1091a 100644
--- a/ice-9/time.scm
+++ b/ice-9/time.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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:
diff --git a/ice-9/weak-vector.scm b/ice-9/weak-vector.scm
index 4f86db5fa..66a7ed56b 100644
--- a/ice-9/weak-vector.scm
+++ b/ice-9/weak-vector.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/lang/Makefile.am b/lang/Makefile.am
index 4538cb1ff..d4019adfc 100644
--- a/lang/Makefile.am
+++ b/lang/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/lang/elisp/Makefile.am b/lang/elisp/Makefile.am
index 0a2561285..ece4dcc93 100644
--- a/lang/elisp/Makefile.am
+++ b/lang/elisp/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/lang/elisp/internals/Makefile.am b/lang/elisp/internals/Makefile.am
index 34581f506..2509212c6 100644
--- a/lang/elisp/internals/Makefile.am
+++ b/lang/elisp/internals/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/lang/elisp/primitives/Makefile.am b/lang/elisp/primitives/Makefile.am
index 1f15f41aa..eb7bbdbe8 100644
--- a/lang/elisp/primitives/Makefile.am
+++ b/lang/elisp/primitives/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/libguile-ltdl/Makefile.am b/libguile-ltdl/Makefile.am
index 0793f33ab..bc83058f3 100644
--- a/libguile-ltdl/Makefile.am
+++ b/libguile-ltdl/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
SUBDIRS = upstream
diff --git a/libguile-ltdl/guile-ltdl.c b/libguile-ltdl/guile-ltdl.c
index f858770e9..89d35afad 100644
--- a/libguile-ltdl/guile-ltdl.c
+++ b/libguile-ltdl/guile-ltdl.c
@@ -20,8 +20,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
diff --git a/libguile-ltdl/guile-ltdl.h b/libguile-ltdl/guile-ltdl.h
index 2f957d5e7..07fe646be 100644
--- a/libguile-ltdl/guile-ltdl.h
+++ b/libguile-ltdl/guile-ltdl.h
@@ -18,8 +18,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
/* Only include this header file once. */
diff --git a/libguile-ltdl/raw-ltdl.c b/libguile-ltdl/raw-ltdl.c
index 09b7f0e08..43591ef6b 100644
--- a/libguile-ltdl/raw-ltdl.c
+++ b/libguile-ltdl/raw-ltdl.c
@@ -20,8 +20,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
diff --git a/libguile-ltdl/raw-ltdl.h b/libguile-ltdl/raw-ltdl.h
index 632168bdb..524ac8271 100644
--- a/libguile-ltdl/raw-ltdl.h
+++ b/libguile-ltdl/raw-ltdl.h
@@ -20,8 +20,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
/* Only include this header file once. */
diff --git a/libguile-ltdl/upstream/Makefile.am b/libguile-ltdl/upstream/Makefile.am
index 9d9fc2632..147b4f769 100644
--- a/libguile-ltdl/upstream/Makefile.am
+++ b/libguile-ltdl/upstream/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/libguile-ltdl/upstream/ltdl.c b/libguile-ltdl/upstream/ltdl.c
index 820bd3071..8bc6f2586 100644
--- a/libguile-ltdl/upstream/ltdl.c
+++ b/libguile-ltdl/upstream/ltdl.c
@@ -20,8 +20,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
diff --git a/libguile-ltdl/upstream/ltdl.h b/libguile-ltdl/upstream/ltdl.h
index 2bbfa302c..1842650b4 100644
--- a/libguile-ltdl/upstream/ltdl.h
+++ b/libguile-ltdl/upstream/ltdl.h
@@ -20,8 +20,8 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
/* Only include this header file once. */
diff --git a/libguile.h b/libguile.h
index 67bdf14e7..3703aadde 100644
--- a/libguile.h
+++ b/libguile.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 85c99c5b8..52e41d09e 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/libguile/__scm.h b/libguile/__scm.h
index d86ec85a2..b2b68a13b 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -17,8 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 3a2c3905f..a750d6b43 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -17,8 +17,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/alist.c b/libguile/alist.c
index 314c1f8e4..2287aec72 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/alist.h b/libguile/alist.h
index 1751728bb..ea05ae4ee 100644
--- a/libguile/alist.h
+++ b/libguile/alist.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index ec1eb7804..bb3840555 100644
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/arbiters.h b/libguile/arbiters.h
index 25c6b7490..0928986b6 100644
--- a/libguile/arbiters.h
+++ b/libguile/arbiters.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/async.c b/libguile/async.c
index 88375f577..34483a483 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/async.h b/libguile/async.h
index 791d71b72..c029b7a58 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 7877a5356..29a77355c 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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 HAVE_CONFIG_H
diff --git a/libguile/backtrace.h b/libguile/backtrace.h
index 74ce0377f..7c5a7cb12 100644
--- a/libguile/backtrace.h
+++ b/libguile/backtrace.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/boolean.c b/libguile/boolean.c
index be4332806..743db2a52 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/boolean.h b/libguile/boolean.h
index 5285021ae..82565acd5 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/chars.c b/libguile/chars.c
index ddc3d7fed..b6d024ef5 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/chars.h b/libguile/chars.h
index 3ad8cc4b8..c2e6759c1 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 5a7dde409..20ddd27ff 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/continuations.h b/libguile/continuations.h
index aa2c66544..ce1991708 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/convert.c b/libguile/convert.c
index d43c14b37..cf31db378 100644
--- a/libguile/convert.c
+++ b/libguile/convert.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/convert.h b/libguile/convert.h
index f461c149b..ade86ab91 100644
--- a/libguile/convert.h
+++ b/libguile/convert.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index 0de695938..73bf61498 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/coop-pthreads.c b/libguile/coop-pthreads.c
index 844db7403..bdcc579f7 100644
--- a/libguile/coop-pthreads.c
+++ b/libguile/coop-pthreads.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/coop-pthreads.h b/libguile/coop-pthreads.h
index 56b1e9645..e4266331d 100644
--- a/libguile/coop-pthreads.h
+++ b/libguile/coop-pthreads.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/coop-threads.h b/libguile/coop-threads.h
index 1275cb760..bf8d16e0b 100644
--- a/libguile/coop-threads.h
+++ b/libguile/coop-threads.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/coop.c b/libguile/coop.c
index ee58d4f84..80340e0fd 100644
--- a/libguile/coop.c
+++ b/libguile/coop.c
@@ -12,11 +12,11 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
-/* $Id: coop.c,v 1.37 2003-04-05 19:10:23 mvo Exp $ */
+/* $Id: coop.c,v 1.38 2005-05-23 19:57:20 mvo Exp $ */
/* Cooperative thread library, based on QuickThreads */
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index 55f30d80a..c7b467ae4 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <string.h>
diff --git a/libguile/debug-malloc.h b/libguile/debug-malloc.h
index 5c878039b..ce204837d 100644
--- a/libguile/debug-malloc.h
+++ b/libguile/debug-malloc.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/debug.c b/libguile/debug.c
index 39aa5ddd3..79458ee18 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/debug.h b/libguile/debug.h
index f967be6b6..43f5221d9 100644
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index 1ada46e78..93236ecb6 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/_scm.h"
diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index 51edc7c10..efc4bcfd8 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index 18dfe0a9a..9998352a5 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/deprecation.h b/libguile/deprecation.h
index e4ba8c9be..53f82e32f 100644
--- a/libguile/deprecation.h
+++ b/libguile/deprecation.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/discouraged.c b/libguile/discouraged.c
index 85d277b8a..cf395e2dd 100644
--- a/libguile/discouraged.c
+++ b/libguile/discouraged.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile.h"
diff --git a/libguile/discouraged.h b/libguile/discouraged.h
index 98435e52e..8dd53af40 100644
--- a/libguile/discouraged.h
+++ b/libguile/discouraged.h
@@ -27,7 +27,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 732622661..ea5ef8d9a 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/dynl.h b/libguile/dynl.h
index 64b2f5384..138643f9c 100644
--- a/libguile/dynl.h
+++ b/libguile/dynl.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index d3b3b07f3..f39d59d73 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index 9aab34881..0f386821f 100644
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/environments.c b/libguile/environments.c
index d3ef15252..74bee4bc1 100644
--- a/libguile/environments.c
+++ b/libguile/environments.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/environments.h b/libguile/environments.h
index c5a9ba8a9..2880238c7 100644
--- a/libguile/environments.h
+++ b/libguile/environments.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/eq.c b/libguile/eq.c
index 966962d63..aade6aab9 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/eq.h b/libguile/eq.h
index 424a852d9..12b383902 100644
--- a/libguile/eq.h
+++ b/libguile/eq.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/error.c b/libguile/error.c
index dc7e25ac1..57180e2e1 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/error.h b/libguile/error.h
index 0077401fb..5300ef109 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/eval.c b/libguile/eval.c
index 45ea1e715..8aa57899a 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/eval.h b/libguile/eval.h
index f1b94a05f..7d856a00b 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 0dd5ac076..126f22797 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/evalext.h b/libguile/evalext.h
index c8250de26..37ca3f7c3 100644
--- a/libguile/evalext.h
+++ b/libguile/evalext.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/extensions.c b/libguile/extensions.c
index f6e1e1b9e..e92560ff1 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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 HAVE_CONFIG_H
diff --git a/libguile/extensions.h b/libguile/extensions.h
index 905c35185..a322fbd0b 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/feature.c b/libguile/feature.c
index 9d9c26e3b..73f86c8d4 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/feature.h b/libguile/feature.h
index b82bf4231..6b6e395f2 100644
--- a/libguile/feature.h
+++ b/libguile/feature.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 7673c16f0..862164b46 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/filesys.h b/libguile/filesys.h
index e6cfe782a..f3f71ba8a 100644
--- a/libguile/filesys.h
+++ b/libguile/filesys.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/fluids.c b/libguile/fluids.c
index c55b5fd34..ddd7b2df2 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <stdio.h>
diff --git a/libguile/fluids.h b/libguile/fluids.h
index e5153883b..b52819cfd 100644
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/fports.c b/libguile/fports.c
index 531de4aa7..dc8ac13f9 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/fports.h b/libguile/fports.h
index 3d88c2fb4..a155e8bb8 100644
--- a/libguile/fports.h
+++ b/libguile/fports.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/futures.c b/libguile/futures.c
index 69d208c7e..f7d53a6aa 100644
--- a/libguile/futures.c
+++ b/libguile/futures.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/futures.h b/libguile/futures.h
index 0c3b0b0a6..9b6b6a15b 100644
--- a/libguile/futures.h
+++ b/libguile/futures.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gc-card.c b/libguile/gc-card.c
index 8e772043b..21ece5497 100644
--- a/libguile/gc-card.c
+++ b/libguile/gc-card.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gc-freelist.c b/libguile/gc-freelist.c
index 15145fa40..8bf3cc6d1 100644
--- a/libguile/gc-freelist.c
+++ b/libguile/gc-freelist.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <assert.h>
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index a58ed1376..e88263afb 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gc-mark.c b/libguile/gc-mark.c
index 95ac82088..ad805bfaf 100644
--- a/libguile/gc-mark.c
+++ b/libguile/gc-mark.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gc-segment.c b/libguile/gc-segment.c
index ee87ba73f..925582629 100644
--- a/libguile/gc-segment.c
+++ b/libguile/gc-segment.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <assert.h>
diff --git a/libguile/gc.c b/libguile/gc.c
index 9e46e4128..c0774a6d1 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#define _GNU_SOURCE
diff --git a/libguile/gc.h b/libguile/gc.h
index baf77fa66..0142b4448 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gdb_interface.h b/libguile/gdb_interface.h
index 24f3177a7..29f5575e7 100644
--- a/libguile/gdb_interface.h
+++ b/libguile/gdb_interface.h
@@ -17,7 +17,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
The author can be reached at djurfeldt@nada.kth.se
Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index baddfc41d..1db7cec7f 100644
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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 HAVE_CONFIG_H
diff --git a/libguile/gdbint.h b/libguile/gdbint.h
index f4020398e..59ba5df67 100644
--- a/libguile/gdbint.h
+++ b/libguile/gdbint.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gettext.h b/libguile/gettext.h
index 8b262f4cf..fa3622f56 100644
--- a/libguile/gettext.h
+++ b/libguile/gettext.h
@@ -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
diff --git a/libguile/gh.h b/libguile/gh.h
index cc230cfa0..4898f71bd 100644
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_data.c b/libguile/gh_data.c
index bd50006fc..39c3de152 100644
--- a/libguile/gh_data.c
+++ b/libguile/gh_data.c
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c
index 7f6166e52..be7af5104 100644
--- a/libguile/gh_eval.c
+++ b/libguile/gh_eval.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_funcs.c b/libguile/gh_funcs.c
index 62e27d924..c789ce097 100644
--- a/libguile/gh_funcs.c
+++ b/libguile/gh_funcs.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_init.c b/libguile/gh_init.c
index 16ca35b4e..97c967cfd 100644
--- a/libguile/gh_init.c
+++ b/libguile/gh_init.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_io.c b/libguile/gh_io.c
index c8e1a2e92..057d4be53 100644
--- a/libguile/gh_io.c
+++ b/libguile/gh_io.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_list.c b/libguile/gh_list.c
index d5b84bc58..2d8764a7e 100644
--- a/libguile/gh_list.c
+++ b/libguile/gh_list.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c
index 655bd8b2c..b0d0c1b49 100644
--- a/libguile/gh_predicates.c
+++ b/libguile/gh_predicates.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/goops.c b/libguile/goops.c
index 5690e9c22..52ce76b72 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/goops.h b/libguile/goops.h
index 80f47c6a3..64da26f37 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index e93b4402d..290fd37dc 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/gsubr.h b/libguile/gsubr.h
index 6dd7c1c4d..43a4968ae 100644
--- a/libguile/gsubr.h
+++ b/libguile/gsubr.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/guardians.c b/libguile/guardians.c
index f234bac2e..6ee7ba1a1 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/guardians.h b/libguile/guardians.h
index f2ee0b6d9..7ba9380af 100644
--- a/libguile/guardians.h
+++ b/libguile/guardians.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/guile-doc-snarf.in b/libguile/guile-doc-snarf.in
index 36e1a9453..fd8c00075 100755
--- a/libguile/guile-doc-snarf.in
+++ b/libguile/guile-doc-snarf.in
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
fullfilename=$1
diff --git a/libguile/guile-func-name-check.in b/libguile/guile-func-name-check.in
index adf5594e8..034b8df70 100644
--- a/libguile/guile-func-name-check.in
+++ b/libguile/guile-func-name-check.in
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 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 Greg J. Badros, <gjb@cs.washington.edu>
# 11-Jan-2000
diff --git a/libguile/guile-snarf-docs.in b/libguile/guile-snarf-docs.in
index 5129d7d6f..f010dfb9f 100755
--- a/libguile/guile-snarf-docs.in
+++ b/libguile/guile-snarf-docs.in
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
bindir=`dirname $0`
diff --git a/libguile/guile-snarf.awk.in b/libguile/guile-snarf.awk.in
index 107e4fc7d..509957a0c 100644
--- a/libguile/guile-snarf.awk.in
+++ b/libguile/guile-snarf.awk.in
@@ -12,8 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 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 Greg J. Badros, <gjb@cs.washington.edu>
# 12-Dec-1999
diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
index f6977cac2..b568a4423 100644
--- a/libguile/guile-snarf.in
+++ b/libguile/guile-snarf.in
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this software; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 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:
diff --git a/libguile/guile.c b/libguile/guile.c
index f153be4d3..d17fb412e 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* This is the 'main' function for the `guile' executable. It is not
diff --git a/libguile/hash.c b/libguile/hash.c
index 450746bda..9b73d2f26 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/hash.h b/libguile/hash.h
index 4b33eab24..55499390c 100644
--- a/libguile/hash.h
+++ b/libguile/hash.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index 8e1cb63df..24f16a082 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index e94ffe067..bbf52a29c 100644
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/hooks.c b/libguile/hooks.c
index af317d9f3..fbaa842d3 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/hooks.h b/libguile/hooks.h
index 25567fe3d..83ec507d8 100644
--- a/libguile/hooks.h
+++ b/libguile/hooks.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/i18n.c b/libguile/i18n.c
index c1b8d1e3f..9bfd69c99 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/i18n.h b/libguile/i18n.h
index 07aa1f0de..f7e125510 100644
--- a/libguile/i18n.h
+++ b/libguile/i18n.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/init.c b/libguile/init.c
index a2d33d170..83a116a1d 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/init.h b/libguile/init.h
index a0425f33f..550a1e6db 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/inline.c b/libguile/inline.c
index a57a664b2..2917cfeab 100644
--- a/libguile/inline.c
+++ b/libguile/inline.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#define SCM_INLINE_C_INCLUDING_INLINE_H 1
diff --git a/libguile/inline.h b/libguile/inline.h
index cd4a5e9eb..0a3ede28f 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* This file is for inline functions. On platforms that don't support
diff --git a/libguile/ioext.c b/libguile/ioext.c
index fb2f549bf..f5940b0f0 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/ioext.h b/libguile/ioext.h
index 8f0484e2b..77b0573d7 100644
--- a/libguile/ioext.h
+++ b/libguile/ioext.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/iselect.h b/libguile/iselect.h
index 7078fc9c6..705296590 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 11e7d2e5d..bb0aaff65 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/keywords.h b/libguile/keywords.h
index 64273278a..bea703c97 100644
--- a/libguile/keywords.h
+++ b/libguile/keywords.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/lang.c b/libguile/lang.c
index 662f680be..4b8c81bf7 100644
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/lang.h b/libguile/lang.h
index 7d3c9ad1b..dc6b910a2 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/list.c b/libguile/list.c
index c13511cbb..b28d06bd1 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/list.h b/libguile/list.h
index 5cecbbe1c..16d7454a5 100644
--- a/libguile/list.h
+++ b/libguile/list.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/load.c b/libguile/load.c
index d78cf6336..4b51a0bb6 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/load.h b/libguile/load.h
index 98bca8b31..5cebbe0e9 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/macros.c b/libguile/macros.c
index 37d4782cf..25e19c70f 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/macros.h b/libguile/macros.h
index 2ce1f48a0..d9de4d9eb 100644
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index da36c39dc..236c55154 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index 6e60a155e..6c4c06078 100644
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/mkstemp.c b/libguile/mkstemp.c
index 25b23e23e..5c354f3d4 100644
--- a/libguile/mkstemp.c
+++ b/libguile/mkstemp.c
@@ -14,8 +14,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.
*/
#if HAVE_CONFIG_H
diff --git a/libguile/modules.c b/libguile/modules.c
index 93e3064d7..557b33aaa 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/modules.h b/libguile/modules.h
index 96d38e186..abfe69765 100644
--- a/libguile/modules.h
+++ b/libguile/modules.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/net_db.c b/libguile/net_db.c
index cf353c82e..0785f604e 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/net_db.h b/libguile/net_db.h
index 963f3ad2a..002ff308c 100644
--- a/libguile/net_db.h
+++ b/libguile/net_db.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/null-threads.c b/libguile/null-threads.c
index 7b1f85fc9..67a70df11 100644
--- a/libguile/null-threads.c
+++ b/libguile/null-threads.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <stdlib.h>
diff --git a/libguile/null-threads.h b/libguile/null-threads.h
index 521add258..7014d370d 100644
--- a/libguile/null-threads.h
+++ b/libguile/null-threads.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/numbers.c b/libguile/numbers.c
index c60920b80..52d6fe60a 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/numbers.h b/libguile/numbers.h
index 4b5140a42..8b6e63805 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/objects.c b/libguile/objects.c
index af2690c69..860500796 100644
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/objects.h b/libguile/objects.h
index d6d4a2e42..8cac24c1e 100644
--- a/libguile/objects.h
+++ b/libguile/objects.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/objprop.c b/libguile/objprop.c
index 7135e2cf1..470b3d02c 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/objprop.h b/libguile/objprop.h
index c8083e540..db6b51395 100644
--- a/libguile/objprop.h
+++ b/libguile/objprop.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/options.c b/libguile/options.c
index 102e39594..69cdb6b79 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/options.h b/libguile/options.h
index 42d176093..d6d258d39 100644
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 03610f292..31e845f5d 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/pairs.h b/libguile/pairs.h
index 5435282e7..17256b66c 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/ports.c b/libguile/ports.c
index 10ad897c4..88817992a 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/ports.h b/libguile/ports.h
index 9cf43884a..90c3c9df4 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/posix.c b/libguile/posix.c
index 513dde81f..140976be2 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/posix.h b/libguile/posix.h
index 64151d01f..35e5edfac 100644
--- a/libguile/posix.h
+++ b/libguile/posix.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/print.c b/libguile/print.c
index e00f01cd7..f65e1159b 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/print.h b/libguile/print.h
index 038e75f43..fd7f9d926 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 3a341c574..50f6fa32a 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/procprop.h b/libguile/procprop.h
index a211feafd..d1986c6d0 100644
--- a/libguile/procprop.h
+++ b/libguile/procprop.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/procs.c b/libguile/procs.c
index 82e848058..3b447ff90 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/procs.h b/libguile/procs.h
index 550bb725f..b38bef176 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/properties.c b/libguile/properties.c
index ba0c2a437..803f5050a 100644
--- a/libguile/properties.c
+++ b/libguile/properties.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/properties.h b/libguile/properties.h
index 7f4e09c16..78de9cfde 100644
--- a/libguile/properties.h
+++ b/libguile/properties.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index 811c15f11..6550aab93 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/putenv.c b/libguile/putenv.c
index cc6d27b72..6e4d5a1a3 100644
--- a/libguile/putenv.c
+++ b/libguile/putenv.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/ramap.c b/libguile/ramap.c
index 495658315..3d3440a26 100644
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/ramap.h b/libguile/ramap.h
index 2b8a0e2bc..fb8540e92 100644
--- a/libguile/ramap.h
+++ b/libguile/ramap.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/random.c b/libguile/random.c
index 83e58c409..aeee2b217 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/random.h b/libguile/random.h
index ff0b08c6f..a7a1bc970 100644
--- a/libguile/random.h
+++ b/libguile/random.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index f3675ae86..002c93044 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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 HAVE_CONFIG_H
diff --git a/libguile/rdelim.h b/libguile/rdelim.h
index f1c595369..c5116760d 100644
--- a/libguile/rdelim.h
+++ b/libguile/rdelim.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/read.c b/libguile/read.c
index 756efa6ec..fa0fd7133 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/read.h b/libguile/read.h
index a2370ebf8..1e41616d5 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 1f0b865c7..2e8dcd547 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/regex-posix.h b/libguile/regex-posix.h
index 37207503b..19fdbba2b 100644
--- a/libguile/regex-posix.h
+++ b/libguile/regex-posix.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/root.c b/libguile/root.c
index cc7a7a581..1ec315b6d 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/root.h b/libguile/root.h
index b23b03dd5..91264063f 100644
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/rw.c b/libguile/rw.c
index ce267c186..78d822766 100644
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/rw.h b/libguile/rw.h
index 07184fc42..3da5ec983 100644
--- a/libguile/rw.h
+++ b/libguile/rw.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/scmconfig.h.top b/libguile/scmconfig.h.top
index d8d0d46a6..1f6ef7d04 100644
--- a/libguile/scmconfig.h.top
+++ b/libguile/scmconfig.h.top
@@ -12,5 +12,5 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 3a7927ae2..836da1357 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h
index 22f1664b5..ce124260d 100644
--- a/libguile/scmsigs.h
+++ b/libguile/scmsigs.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/script.c b/libguile/script.c
index 94854976e..a5e8b0af2 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* "script.c" argv tricks for `#!' scripts.
diff --git a/libguile/script.h b/libguile/script.h
index 9f85554c8..d2cf6d6e4 100644
--- a/libguile/script.h
+++ b/libguile/script.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/simpos.c b/libguile/simpos.c
index e7e9d9c2c..d1fcd81c8 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/simpos.h b/libguile/simpos.h
index 7b0e5c2dc..bccc163f1 100644
--- a/libguile/simpos.h
+++ b/libguile/simpos.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/smob.c b/libguile/smob.c
index ce0b6488e..13ed0f9da 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/smob.h b/libguile/smob.h
index 4fd2d1c1b..15099fd7b 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/snarf.h b/libguile/snarf.h
index bef2769ec..34b350c23 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/socket.c b/libguile/socket.c
index 904f11747..0d2ccbdc1 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/socket.h b/libguile/socket.h
index bd661f77b..dad10c441 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/sort.c b/libguile/sort.c
index f95d743d1..5a7f75080 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/sort.h b/libguile/sort.h
index f75bc6c23..ba3253145 100644
--- a/libguile/sort.h
+++ b/libguile/sort.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index a0847c891..f8e0dc60f 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 47c05ffb2..f35012b0b 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index 5a797b32d..01e680584 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srfi-13.h b/libguile/srfi-13.h
index 3eec270aa..6c16c68a3 100644
--- a/libguile/srfi-13.h
+++ b/libguile/srfi-13.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index eaf9e07f1..d7dc15be5 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srfi-14.h b/libguile/srfi-14.h
index c6d0f497a..328759db4 100644
--- a/libguile/srfi-14.h
+++ b/libguile/srfi-14.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index e351da7ac..12870e6bf 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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 HAVE_CONFIG_H
diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h
index 311a42e61..653fd1e5d 100644
--- a/libguile/srfi-4.h
+++ b/libguile/srfi-4.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 4382d871c..a7c3abe69 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index 4bf6e4163..273ae886d 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 6f03442fb..77da146b4 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stacks.h b/libguile/stacks.h
index b6270eaca..4f602a747 100644
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stime.c b/libguile/stime.c
index fcd02f46f..626dc8658 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/stime.h b/libguile/stime.h
index 87d89f47e..21d49cd75 100644
--- a/libguile/stime.h
+++ b/libguile/stime.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strerror.c b/libguile/strerror.c
index a84389587..f646dfaef 100644
--- a/libguile/strerror.c
+++ b/libguile/strerror.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; 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
*/
char *
diff --git a/libguile/strings.c b/libguile/strings.c
index addd1975b..b990575a8 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strings.h b/libguile/strings.h
index 732353a55..a2ec51ae9 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strorder.c b/libguile/strorder.c
index 439f47546..124887b4a 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strorder.h b/libguile/strorder.h
index a2657e901..634c3f93e 100644
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strports.c b/libguile/strports.c
index 612e847ba..063e96086 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/strports.h b/libguile/strports.h
index c17e77773..dfd7c064c 100644
--- a/libguile/strports.h
+++ b/libguile/strports.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/struct.c b/libguile/struct.c
index b7635a319..46b3bf830 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/struct.h b/libguile/struct.h
index 714f8299c..b53690e4e 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/symbols.c b/libguile/symbols.c
index f9f6180d3..a60ab9355 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/symbols.h b/libguile/symbols.h
index 357881d45..eadff545a 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/tags.h b/libguile/tags.h
index 6a6c35233..3f5483f3c 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/threads.c b/libguile/threads.c
index 89ada733b..b0a15e2ca 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/threads.h b/libguile/threads.h
index 89a701075..6c51b2510 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/throw.c b/libguile/throw.c
index ed1dbd881..4e229cd5b 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/throw.h b/libguile/throw.h
index 2384f5519..b449e17d3 100644
--- a/libguile/throw.h
+++ b/libguile/throw.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/unif.c b/libguile/unif.c
index b7dd02070..f8ba5a2e7 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/unif.h b/libguile/unif.h
index d458e43f0..d13e05334 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/validate.h b/libguile/validate.h
index 60c19c4fb..1eb637f7b 100644
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* Written by Greg J. Badros <gjb@cs.washington.edu>, Dec-1999 */
diff --git a/libguile/values.c b/libguile/values.c
index 88aef2bf6..9e01352ea 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/_scm.h"
diff --git a/libguile/values.h b/libguile/values.h
index 7653e3583..b34c0b29d 100644
--- a/libguile/values.h
+++ b/libguile/values.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/variable.c b/libguile/variable.c
index 18da68334..6364db78b 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/variable.h b/libguile/variable.h
index 2a2042355..e5c9bc68f 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 79c20fd0a..efd743408 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 74e06d9cd..3b70c2024 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/version.c b/libguile/version.c
index d9e00be9a..b675d1e21 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/version.h.in b/libguile/version.h.in
index 9151343c4..f2828dc72 100644
--- a/libguile/version.h.in
+++ b/libguile/version.h.in
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/vports.c b/libguile/vports.c
index b43102094..b37e662ae 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/vports.h b/libguile/vports.h
index 00eff708b..78019dfa4 100644
--- a/libguile/vports.h
+++ b/libguile/vports.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 6e51040bb..e45dc1bac 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* As a special exception, Free Software Foundation gives permission
* for additional uses of the text contained in its release of this library.
diff --git a/libguile/weaks.h b/libguile/weaks.h
index 1796fbbe6..10826933d 100644
--- a/libguile/weaks.h
+++ b/libguile/weaks.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/win32-dirent.c b/libguile/win32-dirent.c
index 080ec0982..fca84aecd 100644
--- a/libguile/win32-dirent.c
+++ b/libguile/win32-dirent.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/win32-dirent.h b/libguile/win32-dirent.h
index bc8d2a443..ca404e647 100644
--- a/libguile/win32-dirent.h
+++ b/libguile/win32-dirent.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* Directory stream type.
diff --git a/libguile/win32-socket.c b/libguile/win32-socket.c
index bc2d839de..20f6b76a7 100644
--- a/libguile/win32-socket.c
+++ b/libguile/win32-socket.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/libguile/win32-socket.h b/libguile/win32-socket.h
index 55498b9e9..efb5f7e08 100644
--- a/libguile/win32-socket.h
+++ b/libguile/win32-socket.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/win32-uname.c b/libguile/win32-uname.c
index 8a56baeb8..5b7956b41 100644
--- a/libguile/win32-uname.c
+++ b/libguile/win32-uname.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile/__scm.h"
diff --git a/libguile/win32-uname.h b/libguile/win32-uname.h
index 6b315a450..859a92301 100644
--- a/libguile/win32-uname.h
+++ b/libguile/win32-uname.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#define _UTSNAME_LENGTH 65
diff --git a/oop/Makefile.am b/oop/Makefile.am
index ba2a81099..5545a4956 100644
--- a/oop/Makefile.am
+++ b/oop/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/oop/goops.scm b/oop/goops.scm
index faf719bff..ccbe02f21 100644
--- a/oop/goops.scm
+++ b/oop/goops.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/Makefile.am b/oop/goops/Makefile.am
index 84c711158..61d2f7924 100644
--- a/oop/goops/Makefile.am
+++ b/oop/goops/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/oop/goops/accessors.scm b/oop/goops/accessors.scm
index 0916d7284..cd629c459 100644
--- a/oop/goops/accessors.scm
+++ b/oop/goops/accessors.scm
@@ -12,8 +12,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
;;;;
diff --git a/oop/goops/active-slot.scm b/oop/goops/active-slot.scm
index fd03792b2..e6198d94a 100644
--- a/oop/goops/active-slot.scm
+++ b/oop/goops/active-slot.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/compile.scm b/oop/goops/compile.scm
index b495db5be..5dfb5e762 100644
--- a/oop/goops/compile.scm
+++ b/oop/goops/compile.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/composite-slot.scm b/oop/goops/composite-slot.scm
index a417c543f..a9f773afb 100644
--- a/oop/goops/composite-slot.scm
+++ b/oop/goops/composite-slot.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/describe.scm b/oop/goops/describe.scm
index 4383b02a7..1cb7cd8f1 100644
--- a/oop/goops/describe.scm
+++ b/oop/goops/describe.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/dispatch.scm b/oop/goops/dispatch.scm
index 5af05cff1..a1af69dd7 100644
--- a/oop/goops/dispatch.scm
+++ b/oop/goops/dispatch.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/internal.scm b/oop/goops/internal.scm
index 5c7973055..a8aed7e66 100644
--- a/oop/goops/internal.scm
+++ b/oop/goops/internal.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/old-define-method.scm b/oop/goops/old-define-method.scm
index b40968c1f..b6c251341 100644
--- a/oop/goops/old-define-method.scm
+++ b/oop/goops/old-define-method.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/save.scm b/oop/goops/save.scm
index 5811e636c..88d31f7ee 100644
--- a/oop/goops/save.scm
+++ b/oop/goops/save.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/simple.scm b/oop/goops/simple.scm
index 43683d252..56fc945bb 100644
--- a/oop/goops/simple.scm
+++ b/oop/goops/simple.scm
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/stklos.scm b/oop/goops/stklos.scm
index d2f1be27f..49c62a53e 100644
--- a/oop/goops/stklos.scm
+++ b/oop/goops/stklos.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/oop/goops/util.scm b/oop/goops/util.scm
index 8415f73e7..b4d85e022 100644
--- a/oop/goops/util.scm
+++ b/oop/goops/util.scm
@@ -12,7 +12,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;;
diff --git a/pre-inst-guile-env.in b/pre-inst-guile-env.in
index 2300268d7..b5ab0e715 100644
--- a/pre-inst-guile-env.in
+++ b/pre-inst-guile-env.in
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; 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
# NOTE: If you update this file, please update pre-inst-guile.in as
# well, if appropriate.
diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index c1f5ef1be..5c47b3426 100644
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public
# License along with GUILE; 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
# NOTE: at some point we might consider invoking this under
# pre-inst-guile-env. If this will work, then most of the code below
diff --git a/qt/Makefile.am b/qt/Makefile.am
index b525cc1fe..7513f60cd 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/qt/md/Makefile.am b/qt/md/Makefile.am
index aee320ff7..b686468f5 100644
--- a/qt/md/Makefile.am
+++ b/qt/md/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/qt/time/Makefile.am b/qt/time/Makefile.am
index ab4fffee1..909cdf4e2 100644
--- a/qt/time/Makefile.am
+++ b/qt/time/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index fc7efdc8f..048093d41 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/scripts/PROGRAM b/scripts/PROGRAM
index 9ce5f022a..476e0dfca 100755
--- a/scripts/PROGRAM
+++ b/scripts/PROGRAM
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: J.R.Hacker
diff --git a/scripts/api-diff b/scripts/api-diff
index 433ff0f45..47188bd08 100755
--- a/scripts/api-diff
+++ b/scripts/api-diff
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/autofrisk b/scripts/autofrisk
index cbb91d271..5d44d6c72 100755
--- a/scripts/autofrisk
+++ b/scripts/autofrisk
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/display-commentary b/scripts/display-commentary
index 59b0890fc..967882449 100755
--- a/scripts/display-commentary
+++ b/scripts/display-commentary
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen
diff --git a/scripts/doc-snarf b/scripts/doc-snarf
index 5b72fc5f8..11979e103 100755
--- a/scripts/doc-snarf
+++ b/scripts/doc-snarf
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Martin Grabmueller
diff --git a/scripts/frisk b/scripts/frisk
index 108fc4a11..25c4f526d 100755
--- a/scripts/frisk
+++ b/scripts/frisk
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/generate-autoload b/scripts/generate-autoload
index 942822ead..8ce13f577 100755
--- a/scripts/generate-autoload
+++ b/scripts/generate-autoload
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen
diff --git a/scripts/lint b/scripts/lint
index 9921020ed..6b62ed057 100755
--- a/scripts/lint
+++ b/scripts/lint
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Neil Jerram
diff --git a/scripts/punify b/scripts/punify
index eae8d51a7..00de3c66f 100755
--- a/scripts/punify
+++ b/scripts/punify
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen
diff --git a/scripts/read-rfc822 b/scripts/read-rfc822
index 5d98075ed..12d84b3db 100755
--- a/scripts/read-rfc822
+++ b/scripts/read-rfc822
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/read-scheme-source b/scripts/read-scheme-source
index 31d851bd2..023bd76f4 100755
--- a/scripts/read-scheme-source
+++ b/scripts/read-scheme-source
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen
diff --git a/scripts/read-text-outline b/scripts/read-text-outline
index 1a88f205e..7affb6348 100755
--- a/scripts/read-text-outline
+++ b/scripts/read-text-outline
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/scan-api b/scripts/scan-api
index 29837c8a2..7fdc2e3b0 100755
--- a/scripts/scan-api
+++ b/scripts/scan-api
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
index ad5c7a2cc..500a4097a 100755
--- a/scripts/snarf-check-and-output-texi
+++ b/scripts/snarf-check-and-output-texi
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Michael Livshin
diff --git a/scripts/snarf-guile-m4-docs b/scripts/snarf-guile-m4-docs
index 45d258c61..5ee52da16 100755
--- a/scripts/snarf-guile-m4-docs
+++ b/scripts/snarf-guile-m4-docs
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/summarize-guile-TODO b/scripts/summarize-guile-TODO
index 9abdd6c9a..9d6d3ac55 100755
--- a/scripts/summarize-guile-TODO
+++ b/scripts/summarize-guile-TODO
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/scripts/use2dot b/scripts/use2dot
index dff341744..5f1e5c73d 100755
--- a/scripts/use2dot
+++ b/scripts/use2dot
@@ -19,8 +19,8 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 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: Thien-Thi Nguyen
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index ac4c3b8ac..92c363983 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
AUTOMAKE_OPTIONS = gnu
diff --git a/srfi/srfi-1.c b/srfi/srfi-1.c
index aa56a62db..ccaf5c8c5 100644
--- a/srfi/srfi-1.c
+++ b/srfi/srfi-1.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <libguile.h>
diff --git a/srfi/srfi-1.h b/srfi/srfi-1.h
index 0a20c6b16..963abbfab 100644
--- a/srfi/srfi-1.h
+++ b/srfi/srfi-1.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-1.scm b/srfi/srfi-1.scm
index 7fd1b67c2..f42e0c86e 100644
--- a/srfi/srfi-1.scm
+++ b/srfi/srfi-1.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
;;; Date: 2001-06-06
diff --git a/srfi/srfi-10.scm b/srfi/srfi-10.scm
index ef0cb75c4..d04a6c60d 100644
--- a/srfi/srfi-10.scm
+++ b/srfi/srfi-10.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-11.scm b/srfi/srfi-11.scm
index 790e20ffc..cb805a99b 100644
--- a/srfi/srfi-11.scm
+++ b/srfi/srfi-11.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-13.c b/srfi/srfi-13.c
index 5814f8092..a37164538 100644
--- a/srfi/srfi-13.c
+++ b/srfi/srfi-13.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-13.h b/srfi/srfi-13.h
index c4cf0cb60..85dfca131 100644
--- a/srfi/srfi-13.h
+++ b/srfi/srfi-13.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-13.scm b/srfi/srfi-13.scm
index 49420f70f..4fee4d984 100644
--- a/srfi/srfi-13.scm
+++ b/srfi/srfi-13.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index c2fd02c29..121253438 100644
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "srfi/srfi-14.h"
diff --git a/srfi/srfi-14.h b/srfi/srfi-14.h
index 544e1580b..049b3a55d 100644
--- a/srfi/srfi-14.h
+++ b/srfi/srfi-14.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-14.scm b/srfi/srfi-14.scm
index d8cbe628f..6d65daa6c 100644
--- a/srfi/srfi-14.scm
+++ b/srfi/srfi-14.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-16.scm b/srfi/srfi-16.scm
index a0a4e4693..9f8480145 100644
--- a/srfi/srfi-16.scm
+++ b/srfi/srfi-16.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Martin Grabmueller
diff --git a/srfi/srfi-17.scm b/srfi/srfi-17.scm
index 6c4afe241..6a3e67626 100644
--- a/srfi/srfi-17.scm
+++ b/srfi/srfi-17.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Matthias Koeppe <mkoeppe@mail.math.uni-magdeburg.de>
diff --git a/srfi/srfi-19.scm b/srfi/srfi-19.scm
index 4978b96d1..62758add3 100644
--- a/srfi/srfi-19.scm
+++ b/srfi/srfi-19.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Rob Browning <rlb@cs.utexas.edu>
;;; Originally from SRFI reference implementation by Will Fitzgerald.
diff --git a/srfi/srfi-2.scm b/srfi/srfi-2.scm
index c750827c7..9e8fb5dbd 100644
--- a/srfi/srfi-2.scm
+++ b/srfi/srfi-2.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-26.scm b/srfi/srfi-26.scm
index 83e79176e..d0f1c57ad 100644
--- a/srfi/srfi-26.scm
+++ b/srfi/srfi-26.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (srfi srfi-26)
:export (cut cute))
diff --git a/srfi/srfi-31.scm b/srfi/srfi-31.scm
index e74b9c909..0c11049b9 100644
--- a/srfi/srfi-31.scm
+++ b/srfi/srfi-31.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Original author: Rob Browning <rlb@defaultvalue.org>
diff --git a/srfi/srfi-34.scm b/srfi/srfi-34.scm
index 9905aa145..e16ff834f 100644
--- a/srfi/srfi-34.scm
+++ b/srfi/srfi-34.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Neil Jerram <neil@ossau.uklinux.net>
diff --git a/srfi/srfi-39.scm b/srfi/srfi-39.scm
index 6808e90b7..68479ddbd 100644
--- a/srfi/srfi-39.scm
+++ b/srfi/srfi-39.scm
@@ -14,8 +14,8 @@
;;
;; You should have received a copy of the GNU General Public License
;; along with this software; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;; Boston, MA 02111-1307 USA
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301 USA
;;
;; As a special exception, the Free Software Foundation gives permission
;; for additional uses of the text contained in its release of GUILE.
diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
index d71c061eb..b7cd79661 100644
--- a/srfi/srfi-4.c
+++ b/srfi/srfi-4.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* This file is now empty since all its procedures are now in the
diff --git a/srfi/srfi-4.h b/srfi/srfi-4.h
index 99a7d9b7c..d638ee386 100644
--- a/srfi/srfi-4.h
+++ b/srfi/srfi-4.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-4.scm b/srfi/srfi-4.scm
index a15f6941c..b1eede7f5 100644
--- a/srfi/srfi-4.scm
+++ b/srfi/srfi-4.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
;;; Author: Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
diff --git a/srfi/srfi-6.scm b/srfi/srfi-6.scm
index c024a3598..0fe2555c2 100644
--- a/srfi/srfi-6.scm
+++ b/srfi/srfi-6.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-60.c b/srfi/srfi-60.c
index 48d1a3e04..73049d3bb 100644
--- a/srfi/srfi-60.c
+++ b/srfi/srfi-60.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include <libguile.h>
diff --git a/srfi/srfi-60.h b/srfi/srfi-60.h
index 662efe0d0..a7f4dd5cb 100644
--- a/srfi/srfi-60.h
+++ b/srfi/srfi-60.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
diff --git a/srfi/srfi-60.scm b/srfi/srfi-60.scm
index e71b4c694..5d7a4b20c 100644
--- a/srfi/srfi-60.scm
+++ b/srfi/srfi-60.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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
(define-module (srfi srfi-60)
#:export (bitwise-and
diff --git a/srfi/srfi-8.scm b/srfi/srfi-8.scm
index 09982efc3..ea186156e 100644
--- a/srfi/srfi-8.scm
+++ b/srfi/srfi-8.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/srfi/srfi-9.scm b/srfi/srfi-9.scm
index 8773523d2..aa877747c 100644
--- a/srfi/srfi-9.scm
+++ b/srfi/srfi-9.scm
@@ -14,7 +14,7 @@
;;
;; You should have received a copy of the GNU Lesser General Public
;; License along with this library; 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:
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 3959770b5..90bf60581 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -16,8 +16,8 @@
##
## You should have received a copy of the GNU General Public
## License along with GUILE; 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
SUBDIRS = standalone
diff --git a/test-suite/guile-test b/test-suite/guile-test
index 226892a80..9c8805497 100755
--- a/test-suite/guile-test
+++ b/test-suite/guile-test
@@ -19,8 +19,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
;;;; Usage: [guile -e main -s] guile-test [OPTIONS] [TEST ...]
diff --git a/test-suite/lib.scm b/test-suite/lib.scm
index 8aad7fcc3..520372762 100644
--- a/test-suite/lib.scm
+++ b/test-suite/lib.scm
@@ -13,8 +13,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite lib)
:use-module (ice-9 stack-catch)
diff --git a/test-suite/standalone/test-asmobs-lib.c b/test-suite/standalone/test-asmobs-lib.c
index c2f9d8520..bbc277d92 100644
--- a/test-suite/standalone/test-asmobs-lib.c
+++ b/test-suite/standalone/test-asmobs-lib.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile.h"
diff --git a/test-suite/standalone/test-conversion.c b/test-suite/standalone/test-conversion.c
index fcadde981..d6902648f 100644
--- a/test-suite/standalone/test-conversion.c
+++ b/test-suite/standalone/test-conversion.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile.h"
diff --git a/test-suite/standalone/test-gh.c b/test-suite/standalone/test-gh.c
index a00cea3d5..8b7f09093 100644
--- a/test-suite/standalone/test-gh.c
+++ b/test-suite/standalone/test-gh.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
/* some bits originally by Jim Blandy <jimb@red-bean.com> */
diff --git a/test-suite/standalone/test-num2integral.c b/test-suite/standalone/test-num2integral.c
index 638227083..af61ec13d 100644
--- a/test-suite/standalone/test-num2integral.c
+++ b/test-suite/standalone/test-num2integral.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "libguile.h"
diff --git a/test-suite/standalone/test-round.c b/test-suite/standalone/test-round.c
index b6bf00786..118961282 100644
--- a/test-suite/standalone/test-round.c
+++ b/test-suite/standalone/test-round.c
@@ -12,7 +12,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; 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
*/
#include "config.h"
diff --git a/test-suite/tests/alist.test b/test-suite/tests/alist.test
index 7173bdb94..e3722dc4d 100644
--- a/test-suite/tests/alist.test
+++ b/test-suite/tests/alist.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (test-suite lib))
diff --git a/test-suite/tests/and-let-star.test b/test-suite/tests/and-let-star.test
index e1f40e062..099c3422d 100644
--- a/test-suite/tests/and-let-star.test
+++ b/test-suite/tests/and-let-star.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-and-let-star)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/arbiters.test b/test-suite/tests/arbiters.test
index 49d6a9508..3aedabd24 100644
--- a/test-suite/tests/arbiters.test
+++ b/test-suite/tests/arbiters.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-arbiters)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/bit-operations.test b/test-suite/tests/bit-operations.test
index 4678d1be8..f63f894ea 100644
--- a/test-suite/tests/bit-operations.test
+++ b/test-suite/tests/bit-operations.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (test-suite lib)
(ice-9 documentation))
diff --git a/test-suite/tests/c-api.test b/test-suite/tests/c-api.test
index 97146ea8a..6c24c0aac 100644
--- a/test-suite/tests/c-api.test
+++ b/test-suite/tests/c-api.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 srcdir (cdr (assq 'srcdir %guile-build-info)))
diff --git a/test-suite/tests/chars.test b/test-suite/tests/chars.test
index 934694f0c..b7319466b 100644
--- a/test-suite/tests/chars.test
+++ b/test-suite/tests/chars.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/common-list.test b/test-suite/tests/common-list.test
index 424916bb5..511da1f57 100644
--- a/test-suite/tests/common-list.test
+++ b/test-suite/tests/common-list.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-common-list)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/continuations.test b/test-suite/tests/continuations.test
index fe83ff187..6d8a6a69a 100644
--- a/test-suite/tests/continuations.test
+++ b/test-suite/tests/continuations.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-continuations)
:use-module (test-suite lib))
diff --git a/test-suite/tests/dynamic-scope.test b/test-suite/tests/dynamic-scope.test
index a8c56a9f0..60f91f05e 100644
--- a/test-suite/tests/dynamic-scope.test
+++ b/test-suite/tests/dynamic-scope.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-dynamic-scope)
:use-module (test-suite lib))
diff --git a/test-suite/tests/elisp.test b/test-suite/tests/elisp.test
index d9d8c4474..964e8baeb 100644
--- a/test-suite/tests/elisp.test
+++ b/test-suite/tests/elisp.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-elisp)
:use-module (test-suite lib)
diff --git a/test-suite/tests/environments.test b/test-suite/tests/environments.test
index 4530206e1..d96295f22 100644
--- a/test-suite/tests/environments.test
+++ b/test-suite/tests/environments.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (ice-9 documentation))
diff --git a/test-suite/tests/eval.test b/test-suite/tests/eval.test
index 5ee2c649d..033e2ccf4 100644
--- a/test-suite/tests/eval.test
+++ b/test-suite/tests/eval.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-eval)
:use-module (test-suite lib)
diff --git a/test-suite/tests/exceptions.test b/test-suite/tests/exceptions.test
index aedd53617..db52126b6 100644
--- a/test-suite/tests/exceptions.test
+++ b/test-suite/tests/exceptions.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (test-suite lib))
diff --git a/test-suite/tests/filesys.test b/test-suite/tests/filesys.test
index 8b57a9af0..6ccb021ea 100644
--- a/test-suite/tests/filesys.test
+++ b/test-suite/tests/filesys.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-filesys)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/format.test b/test-suite/tests/format.test
index 367b944fc..a99dfa737 100644
--- a/test-suite/tests/format.test
+++ b/test-suite/tests/format.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib)
(ice-9 format))
diff --git a/test-suite/tests/fractions.test b/test-suite/tests/fractions.test
index ecd77a2e8..9a95e126b 100644
--- a/test-suite/tests/fractions.test
+++ b/test-suite/tests/fractions.test
@@ -11,7 +11,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.
;;;; Based in part on code from GNU CLISP, Copyright (C) 1993 Michael Stoll
diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
index 161660474..59c7f7cb6 100644
--- a/test-suite/tests/gc.test
+++ b/test-suite/tests/gc.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (ice-9 documentation)
(test-suite lib))
diff --git a/test-suite/tests/getopt-long.test b/test-suite/tests/getopt-long.test
index fcfe8905f..b73eeb402 100644
--- a/test-suite/tests/getopt-long.test
+++ b/test-suite/tests/getopt-long.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib)
(ice-9 getopt-long)
diff --git a/test-suite/tests/goops.test b/test-suite/tests/goops.test
index 1b1b82070..7939ab296 100644
--- a/test-suite/tests/goops.test
+++ b/test-suite/tests/goops.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-goops)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/guardians.test b/test-suite/tests/guardians.test
index 342568a90..cc9294a8f 100644
--- a/test-suite/tests/guardians.test
+++ b/test-suite/tests/guardians.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 tests make some questionable assumptions.
;;; - They assume that a GC will find all dead objects, so they
diff --git a/test-suite/tests/hash.test b/test-suite/tests/hash.test
index a931259e7..58469744f 100644
--- a/test-suite/tests/hash.test
+++ b/test-suite/tests/hash.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-numbers)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/hooks.test b/test-suite/tests/hooks.test
index 49ed515b4..cb43c019d 100644
--- a/test-suite/tests/hooks.test
+++ b/test-suite/tests/hooks.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;;
;;; miscellaneous
diff --git a/test-suite/tests/import.test b/test-suite/tests/import.test
index 642efd30f..cdd75e5a2 100644
--- a/test-suite/tests/import.test
+++ b/test-suite/tests/import.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (exporter)
:export (foo bar))
diff --git a/test-suite/tests/interp.test b/test-suite/tests/interp.test
index 5d872759b..c84e6b397 100644
--- a/test-suite/tests/interp.test
+++ b/test-suite/tests/interp.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
(pass-if "Internal defines 1"
(letrec ((foo (lambda (arg)
diff --git a/test-suite/tests/list.test b/test-suite/tests/list.test
index 64b7c9399..98c14e9e6 100644
--- a/test-suite/tests/list.test
+++ b/test-suite/tests/list.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(use-modules (test-suite lib)
(ice-9 documentation))
diff --git a/test-suite/tests/load.test b/test-suite/tests/load.test
index d6dff96b4..6bcd01f2e 100644
--- a/test-suite/tests/load.test
+++ b/test-suite/tests/load.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-load)
:use-module (test-suite lib)
diff --git a/test-suite/tests/multilingual.nottest b/test-suite/tests/multilingual.nottest
index 468acd924..18163d3a1 100644
--- a/test-suite/tests/multilingual.nottest
+++ b/test-suite/tests/multilingual.nottest
@@ -16,8 +16,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/numbers.test b/test-suite/tests/numbers.test
index 28c068c7e..c19b065ca 100644
--- a/test-suite/tests/numbers.test
+++ b/test-suite/tests/numbers.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-numbers)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/optargs.test b/test-suite/tests/optargs.test
index f59bad507..a45d3609b 100644
--- a/test-suite/tests/optargs.test
+++ b/test-suite/tests/optargs.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-optargs)
:use-module (test-suite lib)
diff --git a/test-suite/tests/options.test b/test-suite/tests/options.test
index 1b1da092a..168676b30 100644
--- a/test-suite/tests/options.test
+++ b/test-suite/tests/options.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/pairs.test b/test-suite/tests/pairs.test
index 39796f923..97fd34f64 100644
--- a/test-suite/tests/pairs.test
+++ b/test-suite/tests/pairs.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/poe.test b/test-suite/tests/poe.test
index b6022eb78..8d353de55 100644
--- a/test-suite/tests/poe.test
+++ b/test-suite/tests/poe.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-ice-9-poe)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/popen.test b/test-suite/tests/popen.test
index 01be63f69..d83d91c4c 100644
--- a/test-suite/tests/popen.test
+++ b/test-suite/tests/popen.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-ice-9-popen)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index e9c1b9065..aab58d071 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-ports)
:use-module (test-suite lib)
diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test
index a218a4869..6e8d51af5 100644
--- a/test-suite/tests/posix.test
+++ b/test-suite/tests/posix.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/q.test b/test-suite/tests/q.test
index a4960619c..d9238c3ee 100644
--- a/test-suite/tests/q.test
+++ b/test-suite/tests/q.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-ice-9-q)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/r4rs.test b/test-suite/tests/r4rs.test
index 347d05dfa..8abfabb3e 100644
--- a/test-suite/tests/r4rs.test
+++ b/test-suite/tests/r4rs.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-r4rs)
:use-module (test-suite lib)
diff --git a/test-suite/tests/r5rs_pitfall.test b/test-suite/tests/r5rs_pitfall.test
index 65204ab15..7fa61daff 100644
--- a/test-suite/tests/r5rs_pitfall.test
+++ b/test-suite/tests/r5rs_pitfall.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;; These tests have been copied from
;; http://sisc.sourceforge.net/r5rs_pitfall.scm and the 'should-be'
diff --git a/test-suite/tests/ramap.test b/test-suite/tests/ramap.test
index 52028f219..467d7abb3 100644
--- a/test-suite/tests/ramap.test
+++ b/test-suite/tests/ramap.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-ramap)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/receive.test b/test-suite/tests/receive.test
index 838f64c7e..2619a268a 100644
--- a/test-suite/tests/receive.test
+++ b/test-suite/tests/receive.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-receive)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/regexp.test b/test-suite/tests/regexp.test
index c5d0d3a4b..1e7cdd20d 100644
--- a/test-suite/tests/regexp.test
+++ b/test-suite/tests/regexp.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib)
(ice-9 regex))
diff --git a/test-suite/tests/slib.test b/test-suite/tests/slib.test
index 6ade45339..fa9a601ce 100644
--- a/test-suite/tests/slib.test
+++ b/test-suite/tests/slib.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 tests are run only if slib is available. slib will need to be
;; installed (or linked) under the configured guile $prefix.
diff --git a/test-suite/tests/socket.test b/test-suite/tests/socket.test
index 5517b53f9..ae47e0765 100644
--- a/test-suite/tests/socket.test
+++ b/test-suite/tests/socket.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-numbers)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/sort.test b/test-suite/tests/sort.test
index e6cb25534..77c2da858 100644
--- a/test-suite/tests/sort.test
+++ b/test-suite/tests/sort.test
@@ -13,8 +13,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/srcprop.test b/test-suite/tests/srcprop.test
index bd58fb531..084a752be 100644
--- a/test-suite/tests/srcprop.test
+++ b/test-suite/tests/srcprop.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-srcprop)
:use-module (test-suite lib))
diff --git a/test-suite/tests/srfi-1.test b/test-suite/tests/srfi-1.test
index 6ac749d5c..04265ea4a 100644
--- a/test-suite/tests/srfi-1.test
+++ b/test-suite/tests/srfi-1.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-1)
(test-suite lib))
diff --git a/test-suite/tests/srfi-10.test b/test-suite/tests/srfi-10.test
index 28caf3ad3..96642e00a 100644
--- a/test-suite/tests/srfi-10.test
+++ b/test-suite/tests/srfi-10.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-10))
diff --git a/test-suite/tests/srfi-11.test b/test-suite/tests/srfi-11.test
index 15cd4ac1b..3c2ad2f37 100644
--- a/test-suite/tests/srfi-11.test
+++ b/test-suite/tests/srfi-11.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-srfi-11)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/srfi-13.test b/test-suite/tests/srfi-13.test
index 55826c948..340456a69 100644
--- a/test-suite/tests/srfi-13.test
+++ b/test-suite/tests/srfi-13.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-13) (srfi srfi-14) (test-suite lib))
diff --git a/test-suite/tests/srfi-14.test b/test-suite/tests/srfi-14.test
index bd927c0bb..ca4e961e6 100644
--- a/test-suite/tests/srfi-14.test
+++ b/test-suite/tests/srfi-14.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-14))
diff --git a/test-suite/tests/srfi-17.test b/test-suite/tests/srfi-17.test
index 1a626813b..52a195576 100644
--- a/test-suite/tests/srfi-17.test
+++ b/test-suite/tests/srfi-17.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-srfi-17)
:use-module (test-suite lib)
diff --git a/test-suite/tests/srfi-19.test b/test-suite/tests/srfi-19.test
index 4300bf0f5..6376dabf6 100644
--- a/test-suite/tests/srfi-19.test
+++ b/test-suite/tests/srfi-19.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
;; SRFI-19 overrides current-date, so we have to do the test in a
;; separate module, or later tests will fail.
diff --git a/test-suite/tests/srfi-31.test b/test-suite/tests/srfi-31.test
index 7be109900..5f00a73b5 100644
--- a/test-suite/tests/srfi-31.test
+++ b/test-suite/tests/srfi-31.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-srfi-31)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/srfi-34.test b/test-suite/tests/srfi-34.test
index 3f648f71b..1875f39da 100644
--- a/test-suite/tests/srfi-34.test
+++ b/test-suite/tests/srfi-34.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-srfi-34)
:duplicates (last) ;; avoid warning about srfi-34 replacing `raise'
diff --git a/test-suite/tests/srfi-39.test b/test-suite/tests/srfi-39.test
index 09a7c66e5..2c09d138d 100644
--- a/test-suite/tests/srfi-39.test
+++ b/test-suite/tests/srfi-39.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-srfi-39)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/srfi-4.test b/test-suite/tests/srfi-4.test
index 832135200..b2e80f5e4 100644
--- a/test-suite/tests/srfi-4.test
+++ b/test-suite/tests/srfi-4.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-4)
(test-suite lib))
diff --git a/test-suite/tests/srfi-6.test b/test-suite/tests/srfi-6.test
index fe098ba23..1b485939b 100644
--- a/test-suite/tests/srfi-6.test
+++ b/test-suite/tests/srfi-6.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/srfi-60.test b/test-suite/tests/srfi-60.test
index 1ef951101..a521529a8 100644
--- a/test-suite/tests/srfi-60.test
+++ b/test-suite/tests/srfi-60.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-srfi-60)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/srfi-9.test b/test-suite/tests/srfi-9.test
index da33d5488..4781b80ad 100644
--- a/test-suite/tests/srfi-9.test
+++ b/test-suite/tests/srfi-9.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (srfi srfi-9))
diff --git a/test-suite/tests/streams.test b/test-suite/tests/streams.test
index afb73bef3..1d5fc8d95 100644
--- a/test-suite/tests/streams.test
+++ b/test-suite/tests/streams.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-streams)
:use-module (test-suite lib)
diff --git a/test-suite/tests/strings.test b/test-suite/tests/strings.test
index afe2ab9f9..296d741e3 100644
--- a/test-suite/tests/strings.test
+++ b/test-suite/tests/strings.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/symbols.test b/test-suite/tests/symbols.test
index 7831a9514..88632aa1e 100644
--- a/test-suite/tests/symbols.test
+++ b/test-suite/tests/symbols.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (ice-9 documentation))
diff --git a/test-suite/tests/syncase.test b/test-suite/tests/syncase.test
index 3a9574cb6..4df9dfa2b 100644
--- a/test-suite/tests/syncase.test
+++ b/test-suite/tests/syncase.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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 tests are in a module so that the syntax transformer does not
;; affect code outside of this file.
diff --git a/test-suite/tests/syntax.test b/test-suite/tests/syntax.test
index 1ea6ac1f6..e944d30a4 100644
--- a/test-suite/tests/syntax.test
+++ b/test-suite/tests/syntax.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-syntax)
:use-module (test-suite lib))
diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
index 838188dc1..88109655f 100644
--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (ice-9 threads)
(test-suite lib))
diff --git a/test-suite/tests/time.test b/test-suite/tests/time.test
index 6b83f6b3a..c47c3f21c 100644
--- a/test-suite/tests/time.test
+++ b/test-suite/tests/time.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-module (test-suite test-time)
#:use-module (test-suite lib)
diff --git a/test-suite/tests/unif.test b/test-suite/tests/unif.test
index 2048029a5..bf1d507ff 100644
--- a/test-suite/tests/unif.test
+++ b/test-suite/tests/unif.test
@@ -14,7 +14,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
(define-module (test-suite test-unif)
#:use-module (test-suite lib))
diff --git a/test-suite/tests/vectors.test b/test-suite/tests/vectors.test
index 1407098fa..c4907f872 100644
--- a/test-suite/tests/vectors.test
+++ b/test-suite/tests/vectors.test
@@ -14,8 +14,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;;; Boston, MA 02110-1301 USA
;; FIXME: As soon as guile supports immutable vectors, this has to be
diff --git a/test-suite/tests/version.test b/test-suite/tests/version.test
index ae8252fb1..0ef230629 100644
--- a/test-suite/tests/version.test
+++ b/test-suite/tests/version.test
@@ -15,8 +15,8 @@
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this software; see the file COPYING. If not, write to
-;;;; the Free Software Foundation, Inc., 59 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-modules (test-suite lib))
diff --git a/test-suite/tests/weaks.test b/test-suite/tests/weaks.test
index 478a483bf..4e0514ddf 100644
--- a/test-suite/tests/weaks.test
+++ b/test-suite/tests/weaks.test
@@ -13,7 +13,7 @@
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; 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
;;; {Description}