Sync up with r21-4-12-chise-0_21-gt-j0-r166.

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

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 03bcb44..f5c527f 100644 (file)
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -1789,7 +1789,8 @@ With argument, insert value in current buffer after the form."
                (setq ces 'binary)
              (goto-char (point-min))
              (while (< (point)(point-max))
-               (cond ((eq (char-after) ?\;)
+               (cond ((and (eq (char-after) ?\;)
+                           (not (eq (char-after (1- (point))) ?\\)))
                       (delete-region (point)(point-at-eol))
                       (if (eq (char-after) ?\n)
                           (delete-char 1)
@@ -1821,7 +1822,11 @@ With argument, insert value in current buffer after the form."
                      (if (and (featurep 'utf-2000)
                               (re-search-backward "\\\\u[0-9A-Fa-f]+" nil t))
                          'utf-8-unix
-                       'binary))))
+                       'binary)
+                   (when (featurep 'utf-2000)
+                     (goto-char (point-min))
+                     (if (re-search-forward "\\\\u[0-9A-Fa-f]+" nil t)
+                         'utf-8-mcs-unix)))))
        (setq ces 'binary))
       (if (eq ces 'binary)
          (setq buffer-file-coding-system 'binary)