auto upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index 7481e2d0b2b6edc318411fab66776d80ec773939,a9523caf0eb5ace55b073b4fe73901c1fd8efce4..743c24ffd91e0dff7ebae3c1d949ede3346cc504
--- 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" "93b43ab1ba3868dbad9ddedc54771a66")
 -;;;;;;  "cl-macs" "cl-macs.el" "3dd5e153133b2752fd52e45792c46dfe")
++;;;;;;  "cl-macs" "cl-macs.el" "6e610d63ae75ac7b631e09c76f75c258")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl--compiler-macro-list* "cl-macs" "\

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

diff --cc src/dispextern.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge