From 2785bf1125de22798a9c374e28cd76c8f3f71fb3 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sat, 29 Dec 2007 21:11:12 +0000
Subject: [PATCH] backup the filetype problem if set in spinit

---
 src/frontend/runcoms.c  | 4 ++--
 src/frontend/runcoms2.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c
index ccf03c531..ed1664d17 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") || eq(buf, "{binary}"))
+        if (eq(buf, "binary"))
             ascii = FALSE;
-        else if (eq(buf, "ascii") || eq(buf, "{ascii}"))
+        else if (eq(buf, "ascii"))
 	    ascii = TRUE;
 	else
             fprintf(cp_err,
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 974fc5c9f..8f0c8b4c2 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -82,10 +82,10 @@ com_resume(wordlist *wl)
       dofile = TRUE;
     
     if (cp_getvar("filetype", VT_STRING, buf)) {
-      if (eq(buf, "binary") || eq(buf, "{binary}"))
+      if (eq(buf, "binary"))
 	ascii = FALSE;
-      else if (eq(buf, "ascii") || eq(buf, "{ascii}"))
-	    ascii = TRUE;
+      else if (eq(buf, "ascii"))
+	ascii = TRUE;
       else
 	fprintf(cp_err,
 		"Warning: strange file type \"%s\" (using \"ascii\")\n",