X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fbytecomp.el;h=cf62f7caeffe26ead94d34e12f46ccf6b09f9039;hb=refs%2Fheads%2Fr21-4-14-chise;hp=56eb5323b5bd95ae13bfcdd5433fb833506e0c56;hpb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 56eb532..cf62f7c 100644
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -1822,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-mcs-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)
@@ -2439,7 +2443,10 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 	 (body (cdr (cdr fun)))
 	 (doc (if (stringp (car body))
 		  (prog1 (car body)
-		    (setq body (cdr body)))))
+		    ;; Discard the doc string
+		    ;; only if it is not the only element of the body.
+		    (if (cdr body)
+			(setq body (cdr body))))))
 	 (int (assq 'interactive body)))
     (dolist (arg arglist)
       (cond ((not (symbolp arg))