fix the filetype problem if set in spinit

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

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,

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,