(wid-edit): Require.

(defun-gmm): Renamed from `gmm-defun-compat'.
(gmm-image-search-load-path): Use it.
(gmm-image-load-path-for-library): Use it.  Sync with `mh-compat.el'.

2 files changed, 16 insertions, 14 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7f0f248c7cf..3cba77d4b21 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gmm-utils.el (wid-edit): Require.
+        (defun-gmm): Renamed from `gmm-defun-compat'.
+        (gmm-image-search-load-path): Use it.
+        (gmm-image-load-path-for-library): Use it.  Sync with `mh-compat.el'.
+
 2006-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mm-decode.el (mm-dissect-buffer): Remove spurious double assignment.
@@ -4112,6 +4119,7 @@ See ChangeLog.2 for earlier changes.
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit
+;; fill-column: 79
 ;; End:
 
 ;;; arch-tag: 3f33a3e7-090d-492b-bedd-02a1417d32b4
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 4db811053ec..f314d0e81d7 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-;; (require 'wid-edit)
+(require 'wid-edit)
 
 (defgroup gmm nil
   "Utility functions for Gnus, Message and MML"
@@ -279,11 +279,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST."
             icon-list))
     tool-bar-map))
 
-;; WARNING: The following is subject to change.  Don't rely on it yet.
-
-;; From MH-E without modifications:
-
-(defmacro gmm-defun-compat (name function arg-list &rest body)
+(defmacro defun-gmm (name function arg-list &rest body)
   "Create function NAME.
 If FUNCTION exists, then NAME becomes an alias for FUNCTION.
 Otherwise, create function NAME with ARG-LIST and BODY."
@@ -292,21 +288,19 @@ Otherwise, create function NAME with ARG-LIST and BODY."
         `(defalias ',name ',function)
       `(defun ,name ,arg-list ,@body))))
 
-(gmm-defun-compat gmm-image-search-load-path
+(defun-gmm gmm-image-search-load-path
   image-search-load-path (file &optional path)
   "Emacs 21 and XEmacs don't have `image-search-load-path'.
 This function returns nil on those systems."
   nil)
 
-;; From MH-E with modifications:
-
-;; Don't use `gmm-defun-compat' until API changes in
-;; `image-load-path-for-library' in Emacs CVS are completed.
+;; Cf. `mh-image-load-path-for-library' in `mh-compat.el'.
 
-(defun gmm-image-load-path-for-library (library image &optional path no-error)
-  "Return a suitable search path for images relative to LIBRARY.
+(defun-gmm gmm-image-load-path-for-library
+  image-load-path-for-library (library image &optional path no-error)
+  "Return a suitable search path for images used by LIBRARY.
 
-First it searches for IMAGE in `image-load-path' (excluding
+It searches for IMAGE in `image-load-path' (excluding
 \"`data-directory'/images\") and `load-path', followed by a path
 suitable for LIBRARY, which includes \"../../etc/images\" and
 \"../etc/images\" relative to the library file itself, and then