This commit was generated by cvs2svn to compensate for changes in r2813,

[chise/xemacs-chise.git.1] / lisp / bytecomp.el

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index e3b7318..d8ab789 100644 (file)
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -3,7 +3,7 @@
 ;;; Copyright (C) 1985-1987, 1991-1994 Free Software Foundation, Inc.
 ;;; Copyright (C) 1996 Ben Wing.
 
-;; Author: Jamie Zawinski <jwz@jwz.org>
+;; Author: Jamie Zawinski <jwz@netscape.com>
 ;;     Hallvard Furuseth <hbf@ulrik.uio.no>
 ;; Keywords: internal
 
@@ -1522,7 +1522,11 @@ With prefix arg (noninteractively: 2nd arg), load the file after compiling."
        (unless byte-compile-overwrite-file
          (ignore-file-errors (delete-file target-file)))
        (if (file-writable-p target-file)
-           (write-region 1 (point-max) target-file)
+           (progn
+             (when (memq system-type '(ms-dos windows-nt))
+               (defvar buffer-file-type)
+               (setq buffer-file-type t))
+             (write-region 1 (point-max) target-file))
          ;; This is just to give a better error message than write-region
          (signal 'file-error
                  (list "Opening output file"
@@ -1743,19 +1747,18 @@ With argument, insert value in current buffer after the form."
   ;; file if under Mule.  If there are any extended characters in the
   ;; input file, use `escape-quoted' to make sure that both binary and
   ;; extended characters are output properly and distinguished properly.
-  ;; Otherwise, use `raw-text' for maximum portability with non-Mule
+  ;; Otherwise, use `no-conversion' for maximum portability with non-Mule
   ;; Emacsen.
-  (when (featurep '(or mule file-coding))
+  (when (featurep 'mule)
     (defvar buffer-file-coding-system)
-    (if (or (featurep '(not mule)) ;; Don't scan buffer if we are not muleized
-           (save-excursion
-             (set-buffer byte-compile-inbuffer)
-             (goto-char (point-min))
-             ;; mrb- There must be a better way than skip-chars-forward
-             (skip-chars-forward (concat (char-to-string 0) "-"
-                                         (char-to-string 255)))
-             (eq (point) (point-max))))
-       (setq buffer-file-coding-system 'raw-text-unix)
+    (if (save-excursion
+         (set-buffer byte-compile-inbuffer)
+         (goto-char (point-min))
+         ;; mrb- There must be a better way than skip-chars-forward
+         (skip-chars-forward (concat (char-to-string 0) "-"
+                                     (char-to-string 255)))
+         (eq (point) (point-max)))
+       (setq buffer-file-coding-system 'no-conversion)
       (insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
       (setq buffer-file-coding-system 'escape-quoted)
       ;; #### Lazy loading not yet implemented for MULE files
@@ -1964,7 +1967,7 @@ list that represents a doc string reference.
               (while (if (setq form (cdr form))
                          (byte-compile-constp (car form))))
               (null form)))
-       ;; eval the macro autoload into the compilation environment
+       ;; eval the macro autoload into the compilation enviroment
        (eval form))
 
     (if name