(compile-interface-spec): Bug fix: the keyword argument is "renamer"

[bpt/guile.git] / ice-9 / optargs.scm

diff --git a/ice-9/optargs.scm b/ice-9/optargs.scm
index bf96537..fd4db65 100644 (file)
--- a/ice-9/optargs.scm
+++ b/ice-9/optargs.scm
@@ -17,6 +17,30 @@
 ;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;;;; Boston, MA 02111-1307 USA
 ;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.
+;;;;
 ;;;; Contributed by Maciej Stachowiak <mstachow@alum.mit.edu>
 
 \f
@@ -180,9 +204,8 @@
 ;; "#&optional" instead of "#:optional"
 
 (read-hash-extend #\& (lambda (c port)
-                       (display
-                        "WARNING: `#&' is deprecated, use `#:' instead\n"
-                        (current-error-port))
+                       (issue-deprecation-warning 
+                        "`#&' is deprecated, use `#:' instead.")
                        (case (read port)
                          ((optional) #:optional)
                          ((key) #:key)
@@ -271,7 +294,8 @@
                                    `((if (not (null? ,rest-gensym))
                                          (error "Too many arguments.")))
                                    '())
-                             ,@BODY)))
+                             (let ()
+                               ,@BODY))))
           `(lambda (,@non-optional-args . ,(if rest-arg rest-arg '()))
              ,@BODY))))))