* message.el (message-make-tool-bar): Rename gmm-image-load-path

to gmm-image-load-path-for-library.  Call with no-error argument.

* gnus-sum.el (gnus-summary-make-tool-bar): Ditto.

* gnus-group.el (gnus-group-make-tool-bar): Ditto.

* gmm-utils.el (gmm-image-load-path): Remove alias.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b95fda5..61443fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-make-tool-bar): Rename gmm-image-load-path
+       to gmm-image-load-path-for-library.  Call with no-error argument.
+
+       * gnus-sum.el (gnus-summary-make-tool-bar): Ditto.
+
+       * gnus-group.el (gnus-group-make-tool-bar): Ditto.
+
+       * gmm-utils.el (gmm-image-load-path): Remove alias.
+
 2006-03-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gmm-utils.el (gmm-image-load-path): Add alias.

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index 0938163..4395628 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -385,9 +385,6 @@ This function is used by Emacs versions that don't have
            (nconc (list image-directory)
                   (delete image-directory (copy-sequence load-path)))))))
 
-;; No time to do it right ATM, sorry...
-(defalias 'gmm-image-load-path 'gmm-image-load-path-for-library)
-
 (defun gmm-customize-mode (&optional mode)
   "Customize customization group for MODE.
 If mode is nil, use `major-mode' of the curent buffer."

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index a4b6062..64133bd 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1137,11 +1137,13 @@ When FORCE, rebuild the tool bar."
     (when gnus-group-redraw-when-idle
       (add-hook 'post-command-hook 'gnus-group-redraw-check nil t))
     (let* ((load-path
-           (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
-                                'load-path))
+           (gmm-image-load-path-for-library "gnus"
+                                            "gnus/toggle-subscription.xpm"
+                                            nil t))
           (image-load-path
-           (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
-                                'image-load-path))
+           (gmm-image-load-path-for-library "gnus"
+                                            "gnus/toggle-subscription.xpm"
+                                            'image-load-path t))
           (map (gmm-tool-bar-from-list gnus-group-tool-bar
                                        gnus-group-tool-bar-zap-list
                                        'gnus-group-mode-map)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index a2fea77..00d524a 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2775,9 +2775,13 @@ When FORCE, rebuild the tool bar."
             tool-bar-mode
             (or (not gnus-summary-tool-bar-map) force))
     (let* ((load-path
-           (gmm-image-load-path "gnus" "mail/save.xpm" 'load-path))
+           (gmm-image-load-path-for-library "gnus"
+                                            "mail/save.xpm"
+                                            nil t))
           (image-load-path
-           (gmm-image-load-path "gnus" "mail/save.xpm" 'image-load-path))
+           (gmm-image-load-path-for-library "gnus"
+                                            "mail/save.xpm"
+                                            'image-load-path t))
           (map (gmm-tool-bar-from-list gnus-summary-tool-bar
                                        gnus-summary-tool-bar-zap-list
                                        'gnus-summary-mode-map)))

diff --git a/lisp/message.el b/lisp/message.el
index 0d9950c..9b48e5c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6803,11 +6803,13 @@ When FORCE, rebuild the tool bar."
             (or (not message-tool-bar-map) force))
     (setq message-tool-bar-map
          (let ((load-path
-                (gmm-image-load-path "message" "mail/save-draft.xpm"
-                                     'load-path))
+                (gmm-image-load-path-for-library "message"
+                                                 "mail/save-draft.xpm"
+                                                 nil t))
                (image-load-path
-                (gmm-image-load-path "message" "mail/save-draft.xpm"
-                                     'image-load-path)))
+                (gmm-image-load-path-for-library "message"
+                                                 "mail/save-draft.xpm"
+                                                 'image-load-path t)))
            (gmm-tool-bar-from-list message-tool-bar
                                    message-tool-bar-zap-list
                                    'message-mode-map))))