This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

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

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 5340162..1ce8d27 100644 (file)
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -432,7 +432,6 @@ on the specbind stack.  The cdr of each cell is an integer bitmask.")
 
 (defvar byte-compile-free-references)
 (defvar byte-compile-free-assignments)
-(defvar debug-issue-ebola-notices)
 
 (defvar byte-compiler-error-flag)
 
@@ -1298,11 +1297,7 @@ otherwise pop it")
        (byte-compile-warnings (if (eq byte-compile-warnings t)
                                   byte-compile-default-warnings
                                 byte-compile-warnings))
-       (byte-compile-file-domain nil)
-
-       ;; We reserve the right to compare ANY objects for equality.
-       (debug-issue-ebola-notices -42)
-       )
+       (byte-compile-file-domain nil))
      (prog1
         (progn ,@body)
        (if (memq 'unused-vars byte-compile-warnings)
@@ -1752,7 +1747,7 @@ 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 `no-conversion' for maximum portability with non-Mule
+  ;; Otherwise, use `raw-text' for maximum portability with non-Mule
   ;; Emacsen.
   (when (featurep 'mule)
     (defvar buffer-file-coding-system)
@@ -1763,7 +1758,7 @@ With argument, insert value in current buffer after the form."
          (skip-chars-forward (concat (char-to-string 0) "-"
                                      (char-to-string 255)))
          (eq (point) (point-max)))
-       (setq buffer-file-coding-system 'no-conversion)
+       (setq buffer-file-coding-system 'raw-text)
       (insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
       (setq buffer-file-coding-system 'escape-quoted)
       ;; #### Lazy loading not yet implemented for MULE files