Require loaddef file rather than loading it.

3 files changed, 4 insertions, 11 deletions

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 74679246d3e..0ec489f80ca 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -116,12 +116,9 @@
 
 ;;; Code:
 
-;; (elisp) Eval During Compile: "Effectively `require' is
-;; automatically `eval-and-compile'" [but `load' is not]
-(eval-and-compile
-  (load "cal-loaddefs" nil 'quiet))
+(require 'cal-loaddefs)
 
-;; Avoid recursive load of calendar when loading cal-menu.
+;; Avoid recursive load of calendar when loading cal-menu.  Yuck.
 (provide 'calendar)
 (require 'cal-menu)
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index e9350330193..75cd12d3210 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -31,9 +31,7 @@
 ;;; Code:
 
 (require 'calendar)
-
-(eval-and-compile
-  (load "diary-loaddefs" nil 'quiet))
+(require 'diary-loaddefs)
 
 (defcustom diary-include-string "#include"
   "The string indicating inclusion of another file of diary entries.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 8660d247d98..4a4fe325b8e 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -31,9 +31,7 @@
 ;;; Code:
 
 (require 'calendar)
-
-(eval-and-compile
-  (load "hol-loaddefs" nil 'quiet))
+(require 'hol-loaddefs)
 
 ;;;###diary-autoload
 (defun calendar-holiday-list ()