Synch to No Gnus 200603141446.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19b9217..8647d7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gmm-utils.el (gmm-image-load-path-for-library): Fix typo.  Use
+       `defun' instead of `gmm-defun-compat'.
+
 2006-03-14  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-unique-id): Don't use message-number-base36

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index 374e0b4..0620ea7 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -298,8 +298,10 @@ This function returns nil on those systems."
 
 ;; From MH-E with modifications:
 
-(gmm-defun-compat gmm-image-load-path-for-library
-  image-load-path-for-library (library image &optional path no-error)
+;; Don't use `gmm-defun-compat' until API changes in
+;; `image-load-path-for-library' in Emacs CVS are completed.
+
+(defun gmm-image-load-path-for-library (library image &optional path no-error)
   "Return a suitable search path for images relative to LIBRARY.
 
 Images for LIBRARY are searched for in \"../../etc/images\" and
@@ -312,7 +314,7 @@ path to IMAGE.  If PATH is given, it is used instead of
 instead of a path.
 
 If NO-ERROR is non-nil, don't signal an error if no suitable path
-for can be found.
+can be found.
 
 Here is an example that uses a common idiom to provide
 compatibility with versions of Emacs that lack the variable