[[project @ 1997-03-11 04:30:38 by ghouston]
ghouston**19970311043043
 Ignore-this: 6661a8851a8ce201fd46c59ef98ef0f9
 * (let-opt.scm, utilities.scm): revert to scsh's versions, no longer
 renaming :optional.
 (rw.scm, network.scm): change optional back to :optional.
] hunk ./ChangeLog 1
+Tue Mar 11 04:09:55 1997  Gary Houston  <ghouston@actrix.gen.nz>
+
+	* (let-opt.scm, utilities.scm): revert to scsh's versions, no longer
+	renaming :optional.
+	(rw.scm, network.scm): change optional back to :optional.
+
hunk ./INCOMPAT 5
-:optional has been renamed to optional, due to conflict with the
-Guile keyword support.  Hopefully a better solution will be found
-shortly.
-
hunk ./let-opt.scm 2
-;;; for Guile: replaced :optional with optional.
hunk ./let-opt.scm 4
-;;; 	(OPTIONAL rest-arg default-exp)
+;;; 	(:OPTIONAL rest-arg default-exp)
hunk ./let-opt.scm 10
-;;; The LET-OPTIONALS* and OPTIONAL macros are defined with simple
+;;; The LET-OPTIONALS* and :OPTIONAL macros are defined with simple
hunk ./let-opt.scm 28
-;;;		 (optional       :syntax))
+;;;		 (:optional       :syntax))
hunk ./let-opt.scm 185
-				  (optional      :syntax))
+				  (:optional      :syntax))
hunk ./let-opt.scm 197
-;;; (optional rest-arg default-exp)
+;;; (:optional rest-arg default-exp)
hunk ./let-opt.scm 209
-(define-syntax optional
+(define-syntax :optional
hunk ./let-opt.scm 211
-    ((optional rest default-exp)
+    ((:optional rest default-exp)
hunk ./network.scm 167
-  (let ((protocol (optional maybe-protocol 0)))
+  (let ((protocol (:optional maybe-protocol 0)))
hunk ./network.scm 381
-  (let ((flags (optional maybe-flags 0)))
+  (let ((flags (:optional maybe-flags 0)))
hunk ./network.scm 433
-  (let ((flags (optional maybe-flags 0)))
+  (let ((flags (:optional maybe-flags 0)))
hunk ./network.scm 818
-  (let ((proto (optional maybe-proto "")))
+  (let ((proto (:optional maybe-proto "")))
hunk ./network.scm 841
-  (let* ((vec (getservbyname name (optional maybe-proto "")))
+  (let* ((vec (getservbyname name (:optional maybe-proto "")))
hunk ./rw.scm 44
-	 (fd/port (optional maybe-fd/port (current-input-port)))
+	 (fd/port (:optional maybe-fd/port (current-input-port)))
hunk ./rw.scm 82
-	 (fd/port (optional maybe-fd/port (current-input-port)))
+	 (fd/port (:optional maybe-fd/port (current-input-port)))
hunk ./rw.scm 150
-;		 (optional maybe-eof-value (error "EOF in y-or-n?"))
+;		 (:optional maybe-eof-value (error "EOF in y-or-n?"))
hunk ./utilities.scm 4
-;;; for Guile: changed use of :optional to optional.
-
hunk ./utilities.scm 20
-  (let ((start (max 0 (optional maybe-start 0)))
+  (let ((start (max 0 (:optional maybe-start 0)))
hunk ./utilities.scm 29
-	 (start (min (optional maybe-start len)
+	 (start (min (:optional maybe-start len)