* calendar/calendar.el (cal-loaddefs):

* calendar/diary-lib.el (diary-loaddefs):
* calendar/holidays.el (hol-loaddefs):
* eshell/esh-module.el (esh-groups):
* mh/mh-e.el (mh-loaddefs): Load rather than require.

7 files changed, 17 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ccb97f2150..5ff816a3552 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * calendar/calendar.el (cal-loaddefs):
+        * calendar/diary-lib.el (diary-loaddefs):
+        * calendar/holidays.el (hol-loaddefs):
+        * eshell/esh-module.el (esh-groups): Load rather than require.
+
 2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * calendar/todo-mode.el (todo-add-category): Don't hardcode point-min==1.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 75fe5abc3ca..d72a56d1114 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -114,7 +114,7 @@
 
 ;;; Code:
 
-(require 'cal-loaddefs)
+(load "cal-loaddefs" nil 'nomessage)
 
 ;; Avoid recursive load of calendar when loading cal-menu.  Yuck.
 (provide 'calendar)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 797f330e408..68dbf144aa3 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (require 'calendar)
-(require 'diary-loaddefs)
+(load "diary-loaddefs" nil 'nomessage)
 
 (defgroup diary nil
   "Emacs diary."
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index c1c38351fb1..d4d1e914333 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (require 'calendar)
-(require 'hol-loaddefs)
+(load "hol-loaddefs" nil 'nomessage)
 
 (defgroup holidays nil
   "Holidays support in calendar."
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 9cdebd71295..07040738683 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -38,7 +38,7 @@ customizing the variable `eshell-modules-list'."
 ;; load the defgroup's for the standard extension modules, so that
 ;; documentation can be provided when the user customize's
 ;; `eshell-modules-list'.
-(require 'esh-groups)
+(load "esh-groups" nil 'nomessage)
 
 ;;; User Variables:
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 3102f74f506..0ad943588bd 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-e.el (mh-loaddefs): Load rather than require.
+
 2009-10-06  Glenn Morris  <rgm@gnu.org>
 
         * mh-show.el (mh-show-msg): Use window-full-height-p.
@@ -40,7 +44,7 @@
 
         * mh-seq.el (mh-parse-flist-output-line): Return list rather than values.
         We want to avoid emacs using m-v facilities.
-        (mh-folder-size-folder):  Ditto.
+        (mh-folder-size-folder): Ditto.
         (mh-parse-flist-output-line): Ditto.
         * mh-thread.el (mh-thread-prune-subject): Ditto.
         * mh-xface.el (mh-picon-get-image): Ditto.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 00c1c895bf3..7b7a9e5d9b5 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -92,7 +92,7 @@
 ;; Provide functions to the rest of MH-E. However, mh-e.el must not
 ;; use any definitions in files that require mh-e from mh-loaddefs,
 ;; for if it does it will introduce a require loop.
-(require 'mh-loaddefs)
+(load "mh-loaddefs" nil 'nomessage)
 
 (mh-require-cl)