X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fbytecomp.el;h=df749631a1b0dce09bb1350b1820c985bdf30ebc;hb=f10cfde1e33b549e7cb6773f2785285d6cda4742;hp=d8ab7892acff906d85340b11d345fb86b8d61147;hpb=a5f466de30a3e927ed1146b0c7e3870e71465c8f;p=chise%2Fxemacs-chise.git

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index d8ab789..df74963 100644
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -1747,28 +1747,73 @@ 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)
-    (if (save-excursion
-	  (set-buffer byte-compile-inbuffer)
+    (let (ces)
+      (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)))
+	(if (eq (point) (point-max))
+	    (setq ces 'raw-text)
+	  (goto-char (point-min))
+	  (while (< (point)(point-max))
+	    (cond ((eq (char-after) ?\;)
+		   (delete-region (point)(point-at-eol))
+		   (if (eq (char-after) ?\n)
+		       (delete-char 1)
+		     (forward-char))
+		   )
+		  ((eq (char-after) ?\?)
+		   (forward-char 2)
+		   )
+		  ((eq (char-after) ?\n)
+		   (forward-char)
+		   )
+		  ((eq (char-after) ?\")
+		   (forward-char)
+		   (while (and (< (point)(point-max))
+			       (not (when (eq (char-after) ?\")
+				      (forward-char)
+				      t)))
+		     (if (eq (char-after) ?\\)
+			 (forward-char 2)
+		       (forward-char)))
+		   )
+		  (t
+		   (forward-char))))
 	  (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
-      ;; mrb - Fix this someday.
-      (save-excursion
-	(set-buffer byte-compile-inbuffer)
-	(setq byte-compile-dynamic nil
-	      byte-compile-dynamic-docstrings nil))
-      ;;(external-debugging-output (prin1-to-string (buffer-local-variables))))
-      ))
+	  (setq ces
+		(if (eq (point) (point-max))
+		    (if (and (featurep 'utf-2000)
+			     (re-search-backward "\\\\u[0-9A-Fa-f]+" nil t))
+			'utf-8-unix
+		      'raw-text)))))
+      (if (eq ces 'raw-text)
+	  (setq buffer-file-coding-system 'raw-text)
+	(cond ((eq ces 'utf-8-unix)
+	       (insert "(require 'mule)\n;;;###coding system: utf-8-unix\n")
+	       (setq buffer-file-coding-system 'utf-8-unix)
+	       )
+	      (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
+	  (set-buffer byte-compile-inbuffer)
+	  (setq byte-compile-dynamic nil
+		byte-compile-dynamic-docstrings nil))
+        ;; (external-debugging-output
+        ;;  (prin1-to-string (buffer-local-variables)))
+	)))
   )