Merge branch 'master' into feature/named-lambdas

diff --cc lisp/emacs-lisp/bytecomp.el
index 8cf4e739c2f84afbdb5514bc6e35a749854fefc2,cc68db73c9fe2912f36455f21f4c0742f8acb7f1..6425789062f4968474083b999cc7a11d9a5694c7
--- 1/lisp/emacs-lisp/bytecomp.el
--- 2/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -1753,15 -1780,11 +1780,16 @@@ It is too wide if it has any lines long
           (setq docs (nth 3 form)))
          ('lambda
            (setq kind "")          ; can't be "function", unfortunately
 -          (setq docs (nth 2 form))))
 +          (let* ((definer (and (cadr form) (symbolp (cadr form))))
 +                 (docstring (nth (if definer 3 2) form)))
 +            (setq docs (and (stringp docstring)
 +                            docstring)))))
 +      (when (and (consp name) (eq (car name) 'quote))
 +        (setq name (cadr name)))
        (when (and kind docs (stringp docs))
          (let ((col (max byte-compile-docstring-max-column fill-column)))
-           (when (byte-compile--wide-docstring-p docs col)
+           (when (and (byte-compile-warning-enabled-p 'docstrings-wide)
+                      (byte-compile--wide-docstring-p docs col))
              (byte-compile-warn-x
               name
               "%sdocstring wider than %s characters" (funcall prefix) col)))

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

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

diff --cc lisp/emacs-lisp/macroexp.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/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

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