(byte-compile-output-as-comment):

Use the size in bytes for the #@ size integer.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 51f7aa307be6201fa458f32000255b5e71ca5289..4487b97b63b38aaf23e0fe05d27336fa60dfb25f 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -9,7 +9,7 @@
 
 ;;; This version incorporates changes up to version 2.10 of the 
 ;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.36 $")
+(defconst byte-compile-version "$Revision: 2.37 $")
 
 ;; This file is part of GNU Emacs.
 
@@ -1836,7 +1836,8 @@ list that represents a doc string reference.
 ;; and return the file position it will have.
 ;; If QUOTED is non-nil, print with quoting; otherwise, print without quoting.
 (defun byte-compile-output-as-comment (exp quoted)
-  (let ((position (point)))
+  (let ((position (point))
+       total-bytes)
     (set-buffer
      (prog1 (current-buffer)
        (set-buffer outbuffer)
@@ -1860,7 +1861,12 @@ list that represents a doc string reference.
        (goto-char (point-max))
        (insert "\037")
        (goto-char position)
-       (insert "#@" (format "%d" (- (point-max) position)))
+       (setq total-bytes 0)
+       (while (not (eobp))
+        (setq total-bytes (+ total-bytes (char-bytes (char-after (point)))))
+        (forward-char 1))
+       (goto-char position)
+       (insert "#@" (format "%d" total-bytes))
 
        ;; Save the file position of the object.
        ;; Note we should add 1 to skip the space