Merge branch 'master' into feature/named-lambdas

diff --cc lisp/Makefile.in
Simple merge

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

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

diff --cc lisp/emacs-lisp/cl-generic.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/comp.el
index 375f003592c3adb30b6fda33db34ed9ffe5fa69c,ad0077dadda9f59afa1d19bf6a552bb53ac53f6c..b8b086b6c16f0782ff6552675560238838ea9eb0
--- 1/lisp/emacs-lisp/comp.el
--- 2/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@@ -1304,16 -1318,26 +1321,28 @@@ clashes.
            (make-temp-file (comp-c-func-name function-name "freefn-")
                            nil ".eln")))
    (let* ((f (symbol-function function-name))
+          (byte-code (byte-compile function-name))
           (c-name (comp-c-func-name function-name "F"))
-          (func (make-comp-func-l :name function-name
-                                  :c-name c-name
-                                  :doc (documentation f t)
-                                  :int-spec (interactive-form f)
-                                  :command-modes (command-modes f)
-                                  :speed (comp-spill-speed function-name)
-                                  :pure (comp-spill-decl-spec function-name
-                                                              'pure)
-                                  :defining-symbol function-name)))
+          (func
+           (if (comp-lex-byte-func-p byte-code)
+               (make-comp-func-l :name function-name
+                                 :c-name c-name
+                                 :doc (documentation f t)
+                                 :int-spec (interactive-form f)
+                                 :command-modes (command-modes f)
+                                 :speed (comp-spill-speed function-name)
+                                 :pure (comp-spill-decl-spec function-name
 -                                                            'pure))
++                                                            'pure)
++                                :defining-symbol function-name)
+             (make-comp-func-d :name function-name
+                               :c-name c-name
+                               :doc (documentation f t)
+                               :int-spec (interactive-form f)
+                               :command-modes (command-modes f)
+                               :speed (comp-spill-speed function-name)
+                               :pure (comp-spill-decl-spec function-name
 -                                                          'pure)))))
++                                                          'pure)
++                              :defining-symbol function-name))))
        (when (byte-code-function-p f)
          (signal 'native-compiler-error
                  '("can't native compile an already byte-compiled function")))

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

diff --cc lisp/emacs-lisp/loaddefs-gen.el
Simple merge

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

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

diff --cc lisp/help.el
Simple merge

diff --cc lisp/progmodes/compile.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/comp.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc test/Makefile.in
Simple merge

diff --cc test/lisp/emacs-lisp/bytecomp-tests.el
Simple merge