Merge remote-tracking branch 'savannah/master' into native-comp

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
index 25e1920cb904167b8657674c5f6a9b55a7735dac,7aae8c0c6a4d357f31bd25d17af539cc087c9a86..4169b0756df4590c16a02d0a112466053963a504
--- 1/lisp/emacs-lisp/bytecomp.el
--- 2/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -1776,12 -1727,13 +1776,17 @@@ It is too wide if it has any lines long
           ;;           (byte-compile-generate-emacs19-bytecodes
           ;;            byte-compile-generate-emacs19-bytecodes)
           (byte-compile-warnings byte-compile-warnings)
+          ;; Indicate that we're not currently loading some file.
+          ;; This is used in `macroexp-file-name' to make sure that
+          ;; loading file A which does (byte-compile-file B) won't
+          ;; cause macro calls in B to think they come from A.
+          (current-load-list (list nil))
           )
 -     ,@body))
 +     (prog1
 +         (progn ,@body)
 +       (when byte-native-compiling
 +         (setq byte-to-native-plist-environment
 +               overriding-plist-environment)))))
  
  (defmacro displaying-byte-compile-warnings (&rest body)
    (declare (debug t))

diff --cc lisp/emacs-lisp/cl-macs.el
index 709085a6d9ebaabab65b8d6495795d878c0f4775,b852d825c761cacfba12a1e720a9c3f228180258..0184fd57e253bed75fe77709a28968723d50b86a
--- 1/lisp/emacs-lisp/cl-macs.el
--- 2/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@@ -2455,15 -2455,7 +2455,15 @@@ values.  For compatibility, (cl-values 
  (defmacro cl-the (type form)
    "Return FORM.  If type-checking is enabled, assert that it is of TYPE."
    (declare (indent 1) (debug (cl-type-spec form)))
-   (if (not (or (not (cl--compiling-file))
 +  ;; When native compiling possibly add the appropriate type hint.
 +  (when (and (boundp 'byte-native-compiling)
 +             byte-native-compiling)
 +    (setf form
 +          (cl-case type
 +            (fixnum `(comp-hint-fixnum ,form))
 +            (cons `(comp-hint-cons ,form))
 +            (otherwise form))))
+   (if (not (or (not (macroexp-compiling-p))
                 (< cl--optimize-speed 3)
                 (= cl--optimize-safety 3)))
        form

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
index 2dd2702acb7781beb07ca8c7f1d0c721efda8b9a,20c7f20d0406efef5fee1fee1006fb2a6a28b956..408da8a9628fbdd7e26ee4bcc47ec2e31f300574
--- 1/lisp/progmodes/elisp-mode.el
--- 2/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@@ -194,13 -195,8 +194,13 @@@ All commands in `lisp-mode-shared-map' 
    ;; Recompile if file or buffer has changed since last compilation.
    (if (and (buffer-modified-p)
           (y-or-n-p (format "Save buffer %s first? " (buffer-name))))
 -      (save-buffer))
 +      (save-buffer)))
 +
 +(defun emacs-lisp-byte-compile-and-load ()
 +  "Byte-compile the current file (if it has changed), then load compiled code."
-   (interactive)
++  (interactive nil emacs-lisp-mode)
 +  (emacs-lisp--before-compile-buffer)
 +  (require 'bytecomp)
    (byte-recompile-file buffer-file-name nil 0)
    (load buffer-file-name))
  

diff --cc lisp/subr.el
Simple merge