From 7f157c76a2fe52a973886ffe031bc91de2dbd707 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sat, 15 Dec 2007 16:29:50 +0000
Subject: [PATCH] fix the filetype problem if set in spinit

---
 ChangeLog               | 3 +++
 src/frontend/runcoms.c  | 4 ++--
 src/frontend/runcoms2.c | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd780ef31..8cc8190b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-12-14 Holger Vogt
+ * src/frontend/runcoms.c, runcoms2.c: fix the filetype problem if set in spinit
+
 2007-12-15 Steven Borley
  * Added automake warning and output verbosity to autogen.sh
  * src/frontend/spiceif.c: Avoid invalid lvalue assignment errors when
diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c
index ed1664d17..ccf03c531 100644
--- a/src/frontend/runcoms.c
+++ b/src/frontend/runcoms.c
@@ -176,9 +176,9 @@ dosim(char *what, wordlist *wl)
     }
 
     if (cp_getvar("filetype", VT_STRING, buf)) {
-        if (eq(buf, "binary"))
+        if (eq(buf, "binary") || eq(buf, "{binary}"))
             ascii = FALSE;
-        else if (eq(buf, "ascii"))
+        else if (eq(buf, "ascii") || eq(buf, "{ascii}"))
 	    ascii = TRUE;
 	else
             fprintf(cp_err,
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 7d9cfd8b2..974fc5c9f 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -82,9 +82,9 @@ com_resume(wordlist *wl)
       dofile = TRUE;
     
     if (cp_getvar("filetype", VT_STRING, buf)) {
-      if (eq(buf, "binary"))
+      if (eq(buf, "binary") || eq(buf, "{binary}"))
 	ascii = FALSE;
-      else if (eq(buf, "ascii"))
+      else if (eq(buf, "ascii") || eq(buf, "{ascii}"))
 	    ascii = TRUE;
       else
 	fprintf(cp_err,