Require loaddef file rather than loading it.

4 files changed, 23 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20816c12e72..14fb413f41a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2008-04-05  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/autoload.el (autoload-ensure-default-file):
+        Provide a feature.
+        * calendar/calendar.el, calendar/diary-lib.el, calendar/holidays.el:
+        Require loaddef file rather than loading it.
+        * Makefile.in ($(lisp)/mh-e/mh-loaddefs.el): Simplify rule now that
+        autoload-ensure-default-file provides a feature.
+
+        * Makefile.in (LOADDEFS): Add mh-loaddefs.el.
+        (AUTOGENEL): mh-loaddefs is in $LOADDEFS now.
+        (compile, compile-always, recompile): Use $LOADDEFS.
+        (cal-autoloads): Remove.
+
+        * calendar/cal-x.el (calendar-dedicate-diary): Use get-buffer rather
+        than buffer-live-p.  Reported by David Koppelman <koppel@ece.lsu.edu>.
+
 2008-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * server.el: Undo part of the multi-tty change, which is only
@@ -91,9 +108,9 @@
 
 2008-04-04  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-        * ediff*el: replaced load with require in eval-when-compile.
+        * ediff*.el: Replace load with require in eval-when-compile.
 
-        * ediff-hook: deleted all invocations of (autoload ...).
+        * ediff-hook: Delete all invocations of (autoload ...).
 
         * ediff-util.el (ediff-setup): Make window-min-height a local variable
         in ediff control window, and set its min height to 2.
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 ()