]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'scratch/correct-warning-pos'
authorAlan Mackenzie <acm@muc.de>
Sat, 22 Jan 2022 17:41:03 +0000 (17:41 +0000)
committerAlan Mackenzie <acm@muc.de>
Sat, 22 Jan 2022 17:41:03 +0000 (17:41 +0000)
1  2 
doc/lispref/streams.texi
lisp/emacs-lisp/bytecomp.el
src/lread.c
src/print.c

Simple merge
index 436783819faff89a658ade4f84328502bb77a599,d6054aef5e15637a25bdc13d35752158fb8b5c3a..903dd50e34dc64a2c9de6815501701045aa7f75a
@@@ -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)
diff --cc src/lread.c
Simple merge
diff --cc src/print.c
Simple merge