Merge branch 'maint'

lisp/org-compat.el

@@ -1055,7 +1055,9 @@ key."
 		   #'org-agenda-diary-entry)))
 
 (eval-after-load "calendar"
-  '(add-hook 'calendar-mode-hook #'org--setup-calendar-bindings))
+  '(progn
+     (require 'org-agenda)
+     (add-hook 'calendar-mode-hook #'org--setup-calendar-bindings)))
 
 ;;;; Saveplace