Merge remote-tracking branch 'origin/master' into scratch/pkg

diff --cc lisp/emacs-lisp/bytecomp.el
index 17d99c6c51cdde174d17b77346731ef54b27d609,cc68db73c9fe2912f36455f21f4c0742f8acb7f1..31f513ec91b117006861c733c96dbc2a938e6835
--- 1/lisp/emacs-lisp/bytecomp.el
--- 2/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -2201,9 -2201,11 +2201,13 @@@ See also `emacs-lisp-byte-compile-and-l
                filename buffer-file-name))
        ;; Don't inherit lexical-binding from caller (bug#12938).
        (unless (local-variable-p 'lexical-binding)
+         (let ((byte-compile-current-buffer (current-buffer)))
+           (byte-compile-warn-x
+            (position-symbol 'a (point-min))
+            "file has no `lexical-binding' directive on its first line"))
          (setq-local lexical-binding nil))
 +      (unless (local-variable-p 'symbol-packages)
 +        (setq-local symbol-packages nil))
        ;; Set the default directory, in case an eval-when-compile uses it.
        (setq default-directory (file-name-directory filename)))
      ;; Check if the file's local variables explicitly specify not to

diff --cc lisp/files.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/xdisp.c
Simple merge