X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fbytecomp.el;h=0122e2692083fef49cb48220fef82c737738c652;hb=54e7eaf6571f9ee352b365bc28a5edf664fa9c60;hp=5340162daf7f9fdb7343d8685b4129b5e4f271a5;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 5340162..0122e26 100644
--- 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)
@@ -1762,10 +1757,19 @@ With argument, insert value in current buffer after the form."
 	  ;; 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)
+	  (and (eq (point) (point-max))
+	       (not
+		(re-search-backward
+		 "\\u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]" nil t))))
+	(setq buffer-file-coding-system 'raw-text)
+      (cond ((featurep 'utf-2000)
+	     (insert "(require 'mule)\n;;;###coding system: utf-8\n")
+	     (setq buffer-file-coding-system 'utf-8)
+	     )
+	    (t
+	     (insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
+	     (setq buffer-file-coding-system 'escape-quoted)
+	     ))
       ;; #### Lazy loading not yet implemented for MULE files
       ;; mrb - Fix this someday.
       (save-excursion