(JX2-7461): Unify CB08559.

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

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 03bcb44..56eb532 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)
@@ -1820,14 +1821,15 @@ With argument, insert value in current buffer after the form."
                  (if (eq (point) (point-max))
                      (if (and (featurep 'utf-2000)
                               (re-search-backward "\\\\u[0-9A-Fa-f]+" nil t))
-                         'utf-8-unix
+                         'utf-8-mcs-unix
                        'binary))))
        (setq ces 'binary))
       (if (eq ces 'binary)
          (setq buffer-file-coding-system 'binary)
-       (cond ((eq ces 'utf-8-unix)
-              (insert "(require 'mule)\n;;;###coding system: utf-8-unix\n")
-              (setq buffer-file-coding-system 'utf-8-unix)
+       (cond ((eq ces 'utf-8-mcs-unix)
+              (insert
+               "(require 'mule)\n;;;###coding system: utf-8-mcs-unix\n")
+              (setq buffer-file-coding-system 'utf-8-mcs-unix)
               )
              (t
               (insert "(require 'mule)\n;;;###coding system: escape-quoted\n")
@@ -3188,7 +3190,9 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 (defun byte-compile-arithcompare (form)
   (case (length (cdr form))
     (0 (byte-compile-subr-wrong-args form "1 or more"))
-    (1 (byte-compile-constant t))
+    (1 (if byte-compile-delete-errors
+          (byte-compile-constant t)
+        (byte-compile-normal-call form)))
     (2 (byte-compile-two-args form))
     (t (byte-compile-normal-call form))))