From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 Oct 2001 15:57:43 +0000 (+0000)
Subject: Fix copyright.  Guarantee regular-expression is loaded.  Fix bug in
X-Git-Tag: 20090517-FFI~2515
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=107e913de6a13c153534ddc46dfa49d4cc43847d;p=mit-scheme.git

Fix copyright.  Guarantee regular-expression is loaded.  Fix bug in
URL:SUBSTRING-ENCODED?.
---

diff --git a/v7/src/runtime/url.scm b/v7/src/runtime/url.scm
index db461a84a..fd4126cf7 100644
--- a/v7/src/runtime/url.scm
+++ b/v7/src/runtime/url.scm
@@ -1,26 +1,29 @@
-;;; -*-Scheme-*-
-;;;
-;;; $Id: url.scm,v 1.8 2000/07/02 05:09:21 cph Exp $
-;;;
-;;; Copyright (c) 2000 Massachusetts Institute of Technology
-;;;
-;;; 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 the Free Software Foundation; either version 2 of the
-;;; License, or (at your option) any later version.
-;;;
-;;; This program 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 this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#| -*-Scheme-*-
+
+$Id: url.scm,v 1.9 2001/10/05 15:57:43 cph Exp $
+
+Copyright (c) 2000, 2001 Massachusetts Institute of Technology
+
+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
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
+|#
 
 ;;;; URL Encoding
 
 (declare (usual-integrations))
+(load-option 'REGULAR-EXPRESSION)
 
 (define url:char-set:safe (string->char-set "$-_.+"))
 (define url:char-set:extra (string->char-set "!*'(),"))
@@ -80,7 +83,7 @@
   (url:decode-substring string 0 (string-length string)))
 
 (define url:substring-encoded?
-  (let ((pattern (rexp-compile url:rexp:xchar)))
+  (let ((pattern (rexp-compile (rexp* url:rexp:xchar))))
     (lambda (string start end)
       (let ((regs (re-substring-match pattern string start end)))
 	(and regs