auto upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index 743c24ffd91e0dff7ebae3c1d949ede3346cc504,f699ee7fb8ebaf7fd4655a03cb6e10154290d4e0..f8855c2b84f1b4b2651ba65c3088616b99e459a2
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -267,7 -267,7 +267,7 @@@ including `cl-block' and `cl-eval-when'
  ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
  ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
  ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
- ;;;;;;  "cl-macs" "cl-macs.el" "6e610d63ae75ac7b631e09c76f75c258")
 -;;;;;;  "cl-macs" "cl-macs.el" "d3af72b1cff3398fa1480065fc2887a2")
++;;;;;;  "cl-macs" "cl-macs.el" "4589068913df8cfd554dfb40865801c5")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl--compiler-macro-list* "cl-macs" "\

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