From 4a50939e6fa9759183430d32c583db8cd02c82aa Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 14 Mar 2006 14:50:15 +0000 Subject: [PATCH] Synch to No Gnus 200603141446. --- lisp/ChangeLog | 5 +++++ lisp/gmm-utils.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19b9217..8647d7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-03-14 Reiner Steib + + * gmm-utils.el (gmm-image-load-path-for-library): Fix typo. Use + `defun' instead of `gmm-defun-compat'. + 2006-03-14 Simon Josefsson * 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 --- 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 -- 1.7.10.4