upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index f2bc7cc9d3c91f357be3c483da47728c1d578399,922c9856208acdd5f71e37d60f50f9a8f7b8a822..5827c745199d6e25973005844b98821ff2b880b5
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -260,7 -260,7 +260,7 @@@ Remove from SYMBOL's plist the propert
  ;;;;;;  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" "00526d56a1062b9c308cf37b59374f2b")
 -;;;;;;  "cl-macs" "cl-macs.el" "da92f58f688ff6fb4d0098eb0f3acf0b")
++;;;;;;  "cl-macs" "cl-macs.el" "8c5b0c97239c3e29cebbf1406534a6d3")
  ;;; 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 lisp/emacs-lisp/cl.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge