diff src/lread.c @ 259:11cf20601dec r20-5b28

Import from CVS: tag r20-5b28
author cvs
date Mon, 13 Aug 2007 10:23:02 +0200
parents 677f6a0ee643
children 8efd647ea9ca
line wrap: on
line diff
--- a/src/lread.c	Mon Aug 13 10:22:10 2007 +0200
+++ b/src/lread.c	Mon Aug 13 10:23:02 2007 +0200
@@ -36,8 +36,8 @@
 #include "opaque.h"
 #include <paths.h>
 #endif
-#ifdef MULE
-#include "mule-coding.h"
+#ifdef FILE_CODING
+#include "file-coding.h"
 #endif
 
 #include "sysfile.h"
@@ -596,8 +596,7 @@
      the need to gcpro noerror, nomessage and nosuffix.
      (Below here, we care only whether they are nil or not.)  */
   file = Fsubstitute_in_file_name (file);
-
-#ifdef MULE
+#ifdef FILE_CODING
   if (!NILP (used_codesys))
     CHECK_SYMBOL (used_codesys);
 #endif
@@ -732,13 +731,12 @@
        files aren't really all that big. */
     Lstream_set_buffering (XLSTREAM (lispstream), LSTREAM_BLOCKN_BUFFERED,
 			   block_size);
-#ifdef MULE
+#ifdef FILE_CODING
     lispstream = make_decoding_input_stream
       (XLSTREAM (lispstream), Fget_coding_system (codesys));
     Lstream_set_buffering (XLSTREAM (lispstream), LSTREAM_BLOCKN_BUFFERED,
 			   block_size);
-#endif /* MULE */
-
+#endif
     /* NOTE: Order of these is very important.  Don't rearrange them. */
     record_unwind_protect (load_unwind, lispstream);
     record_unwind_protect (load_descriptor_unwind, Vload_descriptor_list);
@@ -782,12 +780,12 @@
       load_byte_code_version = 100; /* no Ebolification needed */
 
     readevalloop (lispstream, file, Feval, 0);
-#ifdef MULE
+#ifdef FILE_CODING
     if (!NILP (used_codesys))
       Fset (used_codesys,
 	    XCODING_SYSTEM_NAME
 	    (decoding_stream_coding_system (XLSTREAM (lispstream))));
-#endif /* MULE */
+#endif
     unbind_to (speccount, Qnil);
 
     NUNGCPRO;