bug#11585: Acknowledgement (24.0.50; corrupted byte compiled files)

[Pierre Lorenzon <devel@pollock-nageoire.net>]

[-- Attachment #1: Type: Text/Plain, Size: 95 bytes --]


OK here is how I suggest to rewrite the
`byte-compile-fix-header' function.

Regards

Pierre


[-- Attachment #2: bytcomp-fix-fix.el --]
[-- Type: Application/Octet-Stream, Size: 2147 bytes --]

(defun byte-compile-fix-header (filename)
  "If the current buffer has any multibyte characters, insert a version test."
  (when (< (point-max) (position-bytes (point-max)))
    (goto-char (point-min))
    ;; Find the comment that describes the version condition.
    (when (search-forward "\n;;; This file uses" nil t)
      ;; Maybe better to do nothing if this sttring is not
      ;; found.
      (let ((beg (copy-marker (line-beginning-position))))
	;; (narrow-to-region (line-beginning-position) (point-max)) 
	;; ;; Find the first line of ballast semicolons.
	(when (search-forward ";;;;;;;;;;" nil t)
	  ;; As above if this string is not found header is
	  ;; probably badly formated so better to do
	  ;; nothing. Otherwise first killing the part of the
	  ;; header we want to replace.
	  (kill-region beg (line-beginning-position))
	  ;; Maybe not really necessary.
	  (goto-char beg)
	  ;; (beginning-of-line)
	  ;; (narrow-to-region (point-min) (point))
	  (let (;; (old-header-end (point))
		(minimum-version "23")
		;; delta
		)
	    ;; (delete-region (point-min) (point-max))
	    (insert
	     ";;; This file contains utf-8 non-ASCII characters,\n"
	     ";;; and so cannot be loaded into Emacs 22 or earlier.\n"
	     ;; Have to check if emacs-version is bound so that this works
	     ;; in files loaded early in loadup.el.
	     "(and (boundp 'emacs-version)\n"
	     ;; If there is a name at the end of emacs-version,
	     ;; don't try to check the version number.
	     "     (< (aref emacs-version (1- (length emacs-version))) ?A)\n"
	     (format "     (string-lessp emacs-version \"%s\")\n" minimum-version)
	     "     (error \"`"
	     ;; prin1-to-string is used to quote backslashes.
	     (substring (prin1-to-string (file-name-nondirectory filename))
			1 -1)
	     (format "' was compiled for Emacs %s or later\"))\n\n"
		     minimum-version))
       ;; ;; Now compensate for any change in size, to make sure all
       ;; ;; positions in the file remain valid.
       ;; (setq delta (- (point-max) old-header-end))
       ;; (goto-char (point-max))
       ;; (widen)
       ;; (delete-char delta))))

	    ))))))