From cd5fea8dbe4879f2d79aeef72f7385728db39d75 Mon Sep 17 00:00:00 2001 From: Kevin Ryde Date: Sun, 16 Apr 2006 23:43:48 +0000 Subject: [PATCH 1/1] merge from 1.8 branch --- ice-9/ChangeLog | 11 +++++ ice-9/Makefile.am | 2 +- ice-9/and-let-star.scm | 2 +- ice-9/arrays.scm | 2 +- ice-9/boot-9.scm | 9 ++-- ice-9/buffered-input.scm | 2 +- ice-9/calling.scm | 2 +- ice-9/channel.scm | 2 +- ice-9/common-list.scm | 2 +- ice-9/debug.scm | 2 +- ice-9/debugger.scm | 2 +- ice-9/debugger/Makefile.am | 2 +- ice-9/debugger/command-loop.scm | 2 +- ice-9/debugger/commands.scm | 2 +- ice-9/debugger/state.scm | 2 +- ice-9/debugger/trc.scm | 2 +- ice-9/documentation.scm | 2 +- ice-9/emacs.scm | 2 +- ice-9/expect.scm | 2 +- ice-9/format.scm | 77 ++++++++++++++++++--------------- ice-9/ftw.scm | 2 +- ice-9/gap-buffer.scm | 2 +- ice-9/getopt-long.scm | 2 +- ice-9/hcons.scm | 2 +- ice-9/history.scm | 2 +- ice-9/lineio.scm | 2 +- ice-9/list.scm | 2 +- ice-9/ls.scm | 2 +- ice-9/mapping.scm | 2 +- ice-9/match.scm | 2 +- ice-9/networking.scm | 2 +- ice-9/null.scm | 2 +- ice-9/occam-channel.scm | 2 +- ice-9/optargs.scm | 2 +- ice-9/poe.scm | 2 +- ice-9/popen.scm | 2 +- ice-9/posix.scm | 2 +- ice-9/pretty-print.scm | 2 +- ice-9/psyntax.ss | 2 +- ice-9/q.scm | 2 +- ice-9/r4rs.scm | 2 +- ice-9/r5rs.scm | 2 +- ice-9/rdelim.scm | 2 +- ice-9/receive.scm | 2 +- ice-9/regex.scm | 2 +- ice-9/runq.scm | 2 +- ice-9/rw.scm | 2 +- ice-9/safe-r5rs.scm | 2 +- ice-9/safe.scm | 2 +- ice-9/serialize.scm | 2 +- ice-9/session.scm | 2 +- ice-9/slib.scm | 2 +- ice-9/stack-catch.scm | 2 +- ice-9/streams.scm | 2 +- ice-9/string-fun.scm | 2 +- ice-9/syncase.scm | 2 +- ice-9/test.scm | 2 +- ice-9/threads.scm | 2 +- ice-9/time.scm | 2 +- ice-9/weak-vector.scm | 2 +- 60 files changed, 115 insertions(+), 96 deletions(-) diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 00f11c603..f0e8294b2 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,14 @@ +2006-03-04 Ludovic Courtès + + * ice-9/boot-9.scm (make-autoload-interface): Don't call `set-car!' if + the autoload interface has already been removed from MODULE's uses. + This bug showed up when using a given module both with `autoload' and + `use-module'. + +2006-02-21 Kevin Ryde + + * format.scm (format:out-dollar): Use format:out-inf-nan per ~f etc. + 2006-02-12 Marius Vollmer * deprecated.scm (make-uniform-array): Don't pass the prototype as diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am index 91e827759..734185570 100644 --- a/ice-9/Makefile.am +++ b/ice-9/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in. ## -## Copyright (C) 1998,1999,2000,2001,2003, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## diff --git a/ice-9/and-let-star.scm b/ice-9/and-let-star.scm index 7a7380173..b8cb2a679 100644 --- a/ice-9/and-let-star.scm +++ b/ice-9/and-let-star.scm @@ -1,7 +1,7 @@ ;;;; and-let-star.scm --- and-let* syntactic form (draft SRFI-2) for Guile ;;;; written by Michael Livshin ;;;; -;;;; Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1999, 2001, 2004, 2006 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 diff --git a/ice-9/arrays.scm b/ice-9/arrays.scm index c268ced7d..7ddcc8ab8 100644 --- a/ice-9/arrays.scm +++ b/ice-9/arrays.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1999, 2001, 2004, 2006 Free Software Foundation, Inc. ;;;; ;;;; This program is free software; you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index 7da005c34..0f56f9855 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005 +;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006 ;;;; Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -2136,8 +2136,11 @@ (let ((i (module-public-interface (resolve-module name)))) (if (not i) (error "missing interface for module" name)) - ;; Replace autoload-interface with interface - (set-car! (memq a (module-uses module)) i) + (let ((autoload (memq a (module-uses module)))) + ;; Replace autoload-interface with actual interface if + ;; that has not happened yet. + (if (pair? autoload) + (set-car! autoload i))) (module-local-variable i sym)))))) (module-constructor (make-hash-table 0) '() b #f #f name 'autoload #f #f '() (make-weak-value-hash-table 31) 0))) diff --git a/ice-9/buffered-input.scm b/ice-9/buffered-input.scm index 3942ccd5e..11530e897 100644 --- a/ice-9/buffered-input.scm +++ b/ice-9/buffered-input.scm @@ -1,6 +1,6 @@ ;;;; buffered-input.scm --- construct a port from a buffered input reader ;;;; -;;;; Copyright (C) 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2006 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 diff --git a/ice-9/calling.scm b/ice-9/calling.scm index d60e52aa5..07f7a7805 100644 --- a/ice-9/calling.scm +++ b/ice-9/calling.scm @@ -1,6 +1,6 @@ ;;;; calling.scm --- Calling Conventions ;;;; -;;;; Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2006 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 diff --git a/ice-9/channel.scm b/ice-9/channel.scm index 79481d43c..8cbb00190 100644 --- a/ice-9/channel.scm +++ b/ice-9/channel.scm @@ -1,6 +1,6 @@ ;;; Guile object channel -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2006 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 diff --git a/ice-9/common-list.scm b/ice-9/common-list.scm index 29b25b1fd..7d62bc319 100644 --- a/ice-9/common-list.scm +++ b/ice-9/common-list.scm @@ -1,6 +1,6 @@ ;;;; common-list.scm --- COMMON LISP list functions for Scheme ;;;; -;;;; Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 1996, 1997, 2001, 2006 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 diff --git a/ice-9/debug.scm b/ice-9/debug.scm index 3dd7c8cd2..0e751590d 100644 --- a/ice-9/debug.scm +++ b/ice-9/debug.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation +;;;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2006 Free Software Foundation ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public diff --git a/ice-9/debugger.scm b/ice-9/debugger.scm index da1404935..0ad014881 100644 --- a/ice-9/debugger.scm +++ b/ice-9/debugger.scm @@ -1,6 +1,6 @@ ;;;; Guile Debugger -;;; Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. +;;; Copyright (C) 1999, 2001, 2002, 2006 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 diff --git a/ice-9/debugger/Makefile.am b/ice-9/debugger/Makefile.am index 42822d8a3..7ef09a025 100644 --- a/ice-9/debugger/Makefile.am +++ b/ice-9/debugger/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in. ## -## Copyright (C) 2002, 2004 Free Software Foundation, Inc. +## Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## diff --git a/ice-9/debugger/command-loop.scm b/ice-9/debugger/command-loop.scm index 584eaab16..62a08ea65 100644 --- a/ice-9/debugger/command-loop.scm +++ b/ice-9/debugger/command-loop.scm @@ -1,6 +1,6 @@ ;;;; Guile Debugger command loop -;;; Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc. +;;; Copyright (C) 1999, 2001, 2002, 2003, 2006 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 diff --git a/ice-9/debugger/commands.scm b/ice-9/debugger/commands.scm index f252f0a59..1d716e2bb 100644 --- a/ice-9/debugger/commands.scm +++ b/ice-9/debugger/commands.scm @@ -1,6 +1,6 @@ ;;;; (ice-9 debugger commands) -- debugger commands -;;; Copyright (C) 2002 Free Software Foundation, Inc. +;;; Copyright (C) 2002, 2006 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 diff --git a/ice-9/debugger/state.scm b/ice-9/debugger/state.scm index aa68314ee..11b8ebbf0 100644 --- a/ice-9/debugger/state.scm +++ b/ice-9/debugger/state.scm @@ -1,6 +1,6 @@ ;;;; (ice-9 debugger state) -- debugger state representation -;;; Copyright (C) 2002 Free Software Foundation, Inc. +;;; Copyright (C) 2002, 2006 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 diff --git a/ice-9/debugger/trc.scm b/ice-9/debugger/trc.scm index 1b7c01cc8..49af2747d 100644 --- a/ice-9/debugger/trc.scm +++ b/ice-9/debugger/trc.scm @@ -1,6 +1,6 @@ ;;;; (ice-9 debugger trc) -- tracing for Guile debugger code -;;; Copyright (C) 2002 Free Software Foundation, Inc. +;;; Copyright (C) 2002, 2006 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 diff --git a/ice-9/documentation.scm b/ice-9/documentation.scm index c3a47cfa5..4cf3263b0 100644 --- a/ice-9/documentation.scm +++ b/ice-9/documentation.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000,2001, 2002, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 2000,2001, 2002, 2003, 2006 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 diff --git a/ice-9/emacs.scm b/ice-9/emacs.scm index cadacba70..12d8228ee 100644 --- a/ice-9/emacs.scm +++ b/ice-9/emacs.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2006 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 diff --git a/ice-9/expect.scm b/ice-9/expect.scm index 74901172c..a024e91e8 100644 --- a/ice-9/expect.scm +++ b/ice-9/expect.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1996, 1998, 1999, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 1998, 1999, 2001, 2006 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 diff --git a/ice-9/format.scm b/ice-9/format.scm index 2a92cbfa8..3d17d44df 100644 --- a/ice-9/format.scm +++ b/ice-9/format.scm @@ -1373,44 +1373,49 @@ (width (format:par pars l 2 0 "width")) (padch (format:par pars l 3 format:space-ch #f))) - (format:parse-float - (if (string? number) number (number->string number)) #t 0) - (if (<= (- format:fn-len format:fn-dot) digits) - (format:fn-zfill #f (- digits (- format:fn-len format:fn-dot))) - (format:fn-round digits)) - (let ((numlen (+ format:fn-len 1))) - (if (or (not format:fn-pos?) (memq modifier '(at colon-at))) - (set! numlen (+ numlen 1))) + (cond + ((or (inf? number) (nan? number)) + (format:out-inf-nan number width digits #f #f padch)) + + (else + (format:parse-float + (if (string? number) number (number->string number)) #t 0) + (if (<= (- format:fn-len format:fn-dot) digits) + (format:fn-zfill #f (- digits (- format:fn-len format:fn-dot))) + (format:fn-round digits)) + (let ((numlen (+ format:fn-len 1))) + (if (or (not format:fn-pos?) (memq modifier '(at colon-at))) + (set! numlen (+ numlen 1))) + (if (and mindig (> mindig format:fn-dot)) + (set! numlen (+ numlen (- mindig format:fn-dot)))) + (if (and (= format:fn-dot 0) (not mindig)) + (set! numlen (+ numlen 1))) + (if (< numlen width) + (case modifier + ((colon) + (if (not format:fn-pos?) + (format:out-char #\-)) + (format:out-fill (- width numlen) (integer->char padch))) + ((at) + (format:out-fill (- width numlen) (integer->char padch)) + (format:out-char (if format:fn-pos? #\+ #\-))) + ((colon-at) + (format:out-char (if format:fn-pos? #\+ #\-)) + (format:out-fill (- width numlen) (integer->char padch))) + (else + (format:out-fill (- width numlen) (integer->char padch)) + (if (not format:fn-pos?) + (format:out-char #\-)))) + (if format:fn-pos? + (if (memq modifier '(at colon-at)) (format:out-char #\+)) + (format:out-char #\-)))) (if (and mindig (> mindig format:fn-dot)) - (set! numlen (+ numlen (- mindig format:fn-dot)))) + (format:out-fill (- mindig format:fn-dot) #\0)) (if (and (= format:fn-dot 0) (not mindig)) - (set! numlen (+ numlen 1))) - (if (< numlen width) - (case modifier - ((colon) - (if (not format:fn-pos?) - (format:out-char #\-)) - (format:out-fill (- width numlen) (integer->char padch))) - ((at) - (format:out-fill (- width numlen) (integer->char padch)) - (format:out-char (if format:fn-pos? #\+ #\-))) - ((colon-at) - (format:out-char (if format:fn-pos? #\+ #\-)) - (format:out-fill (- width numlen) (integer->char padch))) - (else - (format:out-fill (- width numlen) (integer->char padch)) - (if (not format:fn-pos?) - (format:out-char #\-)))) - (if format:fn-pos? - (if (memq modifier '(at colon-at)) (format:out-char #\+)) - (format:out-char #\-)))) - (if (and mindig (> mindig format:fn-dot)) - (format:out-fill (- mindig format:fn-dot) #\0)) - (if (and (= format:fn-dot 0) (not mindig)) - (format:out-char #\0)) - (format:out-substr format:fn-str 0 format:fn-dot) - (format:out-char #\.) - (format:out-substr format:fn-str format:fn-dot format:fn-len))))) + (format:out-char #\0)) + (format:out-substr format:fn-str 0 format:fn-dot) + (format:out-char #\.) + (format:out-substr format:fn-str format:fn-dot format:fn-len))))))) ; the flonum buffers diff --git a/ice-9/ftw.scm b/ice-9/ftw.scm index 8e28865a0..09b580c05 100644 --- a/ice-9/ftw.scm +++ b/ice-9/ftw.scm @@ -1,6 +1,6 @@ ;;;; ftw.scm --- filesystem tree walk -;;;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 2002, 2003, 2006 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 diff --git a/ice-9/gap-buffer.scm b/ice-9/gap-buffer.scm index c28367170..b6162e802 100644 --- a/ice-9/gap-buffer.scm +++ b/ice-9/gap-buffer.scm @@ -1,6 +1,6 @@ ;;; gap-buffer.scm --- String buffer that supports point -;;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. +;;; Copyright (C) 2002, 2003, 2006 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 diff --git a/ice-9/getopt-long.scm b/ice-9/getopt-long.scm index 04cfa918a..9e39e60c0 100644 --- a/ice-9/getopt-long.scm +++ b/ice-9/getopt-long.scm @@ -1,4 +1,4 @@ -;;; Copyright (C) 1998, 2001 Free Software Foundation, Inc. +;;; Copyright (C) 1998, 2001, 2006 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 diff --git a/ice-9/hcons.scm b/ice-9/hcons.scm index 1c41e0fdf..6323506d2 100644 --- a/ice-9/hcons.scm +++ b/ice-9/hcons.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1995, 1996, 1998, 2001, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 1996, 1998, 2001, 2003, 2006 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 diff --git a/ice-9/history.scm b/ice-9/history.scm index 69dc17771..921a25741 100644 --- a/ice-9/history.scm +++ b/ice-9/history.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2004, 2006 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 diff --git a/ice-9/lineio.scm b/ice-9/lineio.scm index bb11bdf33..f122268df 100644 --- a/ice-9/lineio.scm +++ b/ice-9/lineio.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1996, 1998, 2001, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 1998, 2001, 2003, 2006 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 diff --git a/ice-9/list.scm b/ice-9/list.scm index 2971d7676..af83d1742 100644 --- a/ice-9/list.scm +++ b/ice-9/list.scm @@ -1,6 +1,6 @@ ;;;; List functions not provided in R5RS or srfi-1 -;;; Copyright (C) 2003 Free Software Foundation, Inc. +;;; Copyright (C) 2003, 2006 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 diff --git a/ice-9/ls.scm b/ice-9/ls.scm index 2571aaadc..e848be32a 100644 --- a/ice-9/ls.scm +++ b/ice-9/ls.scm @@ -1,6 +1,6 @@ ;;;; ls.scm --- functions for browsing modules ;;;; -;;;; Copyright (C) 1995, 1996, 1997, 1999, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2006 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 diff --git a/ice-9/mapping.scm b/ice-9/mapping.scm index 06c35061c..c4ef4fe99 100644 --- a/ice-9/mapping.scm +++ b/ice-9/mapping.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1996, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 2001, 2006 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 diff --git a/ice-9/match.scm b/ice-9/match.scm index a5576d751..2e10c3923 100644 --- a/ice-9/match.scm +++ b/ice-9/match.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2006 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 diff --git a/ice-9/networking.scm b/ice-9/networking.scm index 364eccf0b..c0218821f 100644 --- a/ice-9/networking.scm +++ b/ice-9/networking.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1999, 2005 Free Software Foundation, Inc. +;;;; Copyright (C) 1999, 2005, 2006 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 diff --git a/ice-9/null.scm b/ice-9/null.scm index 4e6923542..b9212e605 100644 --- a/ice-9/null.scm +++ b/ice-9/null.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2006 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 diff --git a/ice-9/occam-channel.scm b/ice-9/occam-channel.scm index 1873365e5..e28f73d3b 100644 --- a/ice-9/occam-channel.scm +++ b/ice-9/occam-channel.scm @@ -1,6 +1,6 @@ ;;;; Occam-like channels -;;; Copyright (C) 2003 Free Software Foundation, Inc. +;;; Copyright (C) 2003, 2006 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 diff --git a/ice-9/optargs.scm b/ice-9/optargs.scm index 40f052519..99329c750 100644 --- a/ice-9/optargs.scm +++ b/ice-9/optargs.scm @@ -1,6 +1,6 @@ ;;;; optargs.scm -- support for optional arguments ;;;; -;;;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2004, 2006 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 diff --git a/ice-9/poe.scm b/ice-9/poe.scm index 3f54b56df..fe963db08 100644 --- a/ice-9/poe.scm +++ b/ice-9/poe.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1996, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 2001, 2006 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 diff --git a/ice-9/popen.scm b/ice-9/popen.scm index 5a643e568..275faaa0c 100644 --- a/ice-9/popen.scm +++ b/ice-9/popen.scm @@ -1,6 +1,6 @@ ;; popen emulation, for non-stdio based ports. -;;;; Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006 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 diff --git a/ice-9/posix.scm b/ice-9/posix.scm index 1ec8b7bf2..53d01a026 100644 --- a/ice-9/posix.scm +++ b/ice-9/posix.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1999 Free Software Foundation, Inc. +;;;; Copyright (C) 1999, 2006 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 diff --git a/ice-9/pretty-print.scm b/ice-9/pretty-print.scm index 673da6517..bef76ddcb 100644 --- a/ice-9/pretty-print.scm +++ b/ice-9/pretty-print.scm @@ -1,6 +1,6 @@ ;;;; -*-scheme-*- ;;;; -;;;; Copyright (C) 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2004, 2006 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 diff --git a/ice-9/psyntax.ss b/ice-9/psyntax.ss index a439d70a6..22e409d3e 100644 --- a/ice-9/psyntax.ss +++ b/ice-9/psyntax.ss @@ -1,6 +1,6 @@ ;;;; -*-scheme-*- ;;;; -;;;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2003, 2006 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 diff --git a/ice-9/q.scm b/ice-9/q.scm index 2602f7025..0c12d7f40 100644 --- a/ice-9/q.scm +++ b/ice-9/q.scm @@ -1,6 +1,6 @@ ;;;; q.scm --- Queues ;;;; -;;;; Copyright (C) 1995, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 2001, 2004, 2006 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 diff --git a/ice-9/r4rs.scm b/ice-9/r4rs.scm index 93b0d8f81..de2aeb2de 100644 --- a/ice-9/r4rs.scm +++ b/ice-9/r4rs.scm @@ -1,7 +1,7 @@ ;;;; r4rs.scm --- definitions needed for libguile to be R4RS compliant ;;;; Jim Blandy --- October 1996 -;;;; Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 1997, 1998, 2000, 2001, 2006 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 diff --git a/ice-9/r5rs.scm b/ice-9/r5rs.scm index bd2b21242..2b40515d3 100644 --- a/ice-9/r5rs.scm +++ b/ice-9/r5rs.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2006 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 diff --git a/ice-9/rdelim.scm b/ice-9/rdelim.scm index e5b040cd6..d21d45c38 100644 --- a/ice-9/rdelim.scm +++ b/ice-9/rdelim.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 1999, 2000, 2001, 2006 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 diff --git a/ice-9/receive.scm b/ice-9/receive.scm index 1b7bbdc87..693dfe3f4 100644 --- a/ice-9/receive.scm +++ b/ice-9/receive.scm @@ -1,6 +1,6 @@ ;;;; SRFI-8 -;;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +;;; Copyright (C) 2000, 2001, 2004, 2006 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 diff --git a/ice-9/regex.scm b/ice-9/regex.scm index 04e2183c0..21beb1665 100644 --- a/ice-9/regex.scm +++ b/ice-9/regex.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1997, 1999, 2001, 2004, 2005 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 1999, 2001, 2004, 2005, 2006 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 diff --git a/ice-9/runq.scm b/ice-9/runq.scm index 6cbbec6f5..6ac4e5783 100644 --- a/ice-9/runq.scm +++ b/ice-9/runq.scm @@ -1,6 +1,6 @@ ;;;; runq.scm --- the runq data structure ;;;; -;;;; Copyright (C) 1996, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 2001, 2006 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 diff --git a/ice-9/rw.scm b/ice-9/rw.scm index ba9baa8fc..2731e889a 100644 --- a/ice-9/rw.scm +++ b/ice-9/rw.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2006 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 diff --git a/ice-9/safe-r5rs.scm b/ice-9/safe-r5rs.scm index d6008e00b..13a44d23d 100644 --- a/ice-9/safe-r5rs.scm +++ b/ice-9/safe-r5rs.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2004, 2006 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 diff --git a/ice-9/safe.scm b/ice-9/safe.scm index c5b6e15c8..15b77990a 100644 --- a/ice-9/safe.scm +++ b/ice-9/safe.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2006 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 diff --git a/ice-9/serialize.scm b/ice-9/serialize.scm index b40c62619..3c70f4421 100644 --- a/ice-9/serialize.scm +++ b/ice-9/serialize.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 2003, 2006 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 diff --git a/ice-9/session.scm b/ice-9/session.scm index 514493f7f..1c9f48016 100644 --- a/ice-9/session.scm +++ b/ice-9/session.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 2000, 2001, 2003, 2006 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 diff --git a/ice-9/slib.scm b/ice-9/slib.scm index 22143c415..a63edb699 100644 --- a/ice-9/slib.scm +++ b/ice-9/slib.scm @@ -1,6 +1,6 @@ ;;;; slib.scm --- definitions needed to get SLIB to work with Guile ;;;; -;;;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2006 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 diff --git a/ice-9/stack-catch.scm b/ice-9/stack-catch.scm index a706727f8..81faca063 100644 --- a/ice-9/stack-catch.scm +++ b/ice-9/stack-catch.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2006 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 diff --git a/ice-9/streams.scm b/ice-9/streams.scm index 6aabfb1a6..317d47245 100644 --- a/ice-9/streams.scm +++ b/ice-9/streams.scm @@ -1,7 +1,7 @@ ;;;; streams.scm --- general lazy streams ;;;; -*- Scheme -*- -;;;; Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 1999, 2001, 2004, 2006 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 diff --git a/ice-9/string-fun.scm b/ice-9/string-fun.scm index 52096f607..590a7d2a4 100644 --- a/ice-9/string-fun.scm +++ b/ice-9/string-fun.scm @@ -1,6 +1,6 @@ ;;;; string-fun.scm --- string manipulation functions ;;;; -;;;; Copyright (C) 1995, 1996, 1997, 1999, 2001 Free Software Foundation, Inc. +;;;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2006 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 diff --git a/ice-9/syncase.scm b/ice-9/syncase.scm index 56f2995b6..6ee4d166e 100644 --- a/ice-9/syncase.scm +++ b/ice-9/syncase.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1997, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2006 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 diff --git a/ice-9/test.scm b/ice-9/test.scm index 956427aee..bed39b621 100644 --- a/ice-9/test.scm +++ b/ice-9/test.scm @@ -1,4 +1,4 @@ -;; Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2006 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 diff --git a/ice-9/threads.scm b/ice-9/threads.scm index 4f613c0a3..74021dc3d 100644 --- a/ice-9/threads.scm +++ b/ice-9/threads.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 1996, 1998, 2001, 2002, 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2006 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 diff --git a/ice-9/time.scm b/ice-9/time.scm index 950e1091a..a7045969f 100644 --- a/ice-9/time.scm +++ b/ice-9/time.scm @@ -1,4 +1,4 @@ -;;;; Copyright (C) 2001, 2004 Free Software Foundation, Inc. +;;;; Copyright (C) 2001, 2004, 2006 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 diff --git a/ice-9/weak-vector.scm b/ice-9/weak-vector.scm index 66a7ed56b..92d40d840 100644 --- a/ice-9/weak-vector.scm +++ b/ice-9/weak-vector.scm @@ -1,6 +1,6 @@ ;;; installed-scm-file -;;;; Copyright (C) 2003 Free Software Foundation, Inc. +;;;; Copyright (C) 2003, 2006 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 -- 2.20.1