From: Alan Mackenzie <acm@muc.de>
Date: Sat, 22 Jan 2022 17:41:03 +0000 (+0000)
Subject: Merge branch 'scratch/correct-warning-pos'
X-Git-Tag: emacs-29.0.90~2852
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88e1f8b02086aaf652e3058b36b7612c073c04b3;p=emacs.git

Merge branch 'scratch/correct-warning-pos'
---

88e1f8b02086aaf652e3058b36b7612c073c04b3
diff --cc lisp/emacs-lisp/bytecomp.el
index 436783819fa,d6054aef5e1..903dd50e34d
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -2291,12 -2302,10 +2302,11 @@@ With argument ARG, insert value in curr
  			       (= (following-char) ?\;))
  		   (forward-line 1))
  		 (not (eobp)))
- 	  (setq byte-compile-read-position (point)
- 		byte-compile-last-position byte-compile-read-position)
            (let* ((lread--unescaped-character-literals nil)
 -                 (form (read-positioning-symbols inbuffer))
++                 (load-read-function #'read-positioning-symbols)
 +                 (form (funcall load-read-function inbuffer))
                   (warning (byte-run--unescaped-character-literals-warning)))
-             (when warning (byte-compile-warn "%s" warning))
+             (when warning (byte-compile-warn-x form "%s" warning))
  	    (byte-compile-toplevel-file-form form)))
  	;; Compile pending forms at end of file.
  	(byte-compile-flush-pending)