From: Joe Marshall <jmarshall@alum.mit.edu>
Date: Sun, 28 Mar 2010 20:48:12 +0000 (-0700)
Subject: Allow keyword-style attribute to be none or false.  Fix typo.
X-Git-Tag: 20100708-Gtk~71^2~14
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=6097e59b3902682baf0807cad567f9d9f3e07770;p=mit-scheme.git

Allow keyword-style attribute to be none or false.  Fix typo.
---

diff --git a/src/runtime/parse.scm b/src/runtime/parse.scm
index 793ee172f..4e4ad435b 100644
--- a/src/runtime/parse.scm
+++ b/src/runtime/parse.scm
@@ -858,10 +858,14 @@ USA.
 	 (lookup-file-attribute file-attribute-alist 'KEYWORD-STYLE)))
     (if (pair? keyword-entry)
 	(let ((value (cdr keyword-entry)))
-	  (cond ((and (symbol value)
+	  (cond ((and (symbol? value)
+		      (or (string-ci=? (symbol-name value) "none")
+			  (string-ci=? (symbol-name value) "false")))
+		 (port/set-property! port '*PARSER-KEYWORD-STYLE* #f))
+		((and (symbol? value)
 		      (string-ci=? (symbol-name value) "prefix"))
 		 (port/set-property! port '*PARSER-KEYWORD-STYLE* 'PREFIX))
-		((and (symbol value)
+		((and (symbol? value)
 		      (string-ci=? (symbol-name value) "suffix"))
 		 (port/set-property! port '*PARSER-KEYWORD-STYLE* 'SUFFIX))
 		(else
@@ -874,7 +878,7 @@ USA.
 	 (lookup-file-attribute file-attribute-alist 'MODE)))
     (if (pair? mode-entry)
 	(let ((value (cdr mode-entry)))
-	  (if (or (not (symbol value))
+	  (if (or (not (symbol? value))
 		  (not (string-ci=? (symbol-name value) "scheme")))
 	      (warn "Unexpected file mode:" (if (symbol? value)
 						(symbol-name value)