Synch to No Gnus 200602220504.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e19772..f7be00f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gmm-utils.el (gmm-image-load-path): Don't make
+       `gmm-image-load-path' include subdirectories which the second arg
+       `image' might specify.
+
+       * gnus-group.el (gnus-group-tool-bar-retro): Prepend the "gnus/"
+       subdirectory to icon file names.
+
+       * gnus-sum.el (gnus-summary-tool-bar-retro): Ditto.
+
 2006-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-group.el (gnus-group-make-tool-bar): Add IMAGE argument to

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index 448337c..f9459ae 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -282,14 +282,21 @@ path to IMAGE.  If PATH is given, it is used instead of
                                    (file-name-directory gmm-library-name)
                                    "../../etc/images")))
           (file-exists-p (expand-file-name image gmm-image-load-path))))
-       ((gmm-image-search-load-path image)
-        ;; Images in image-load-path.
-        (setq gmm-image-load-path
-              (file-name-directory (gmm-image-search-load-path image))))
-       ((locate-library image)
-        ;; Images in load-path.
-        (setq gmm-image-load-path
-              (file-name-directory (locate-library image)))))
+       ((let ((img image)
+              (dir (or
+                    ;; Images in image-load-path.
+                    (gmm-image-search-load-path image)
+                    ;; Images in load-path.
+                    (locate-library image)))
+              parent)
+          (and dir
+               (setq dir (file-name-directory dir))
+               (progn
+                 ;; Remove subdirectories.
+                 (while (setq parent (file-name-directory img))
+                   (setq img (directory-file-name parent)
+                         dir (expand-file-name "../" dir)))
+                 (setq gmm-image-load-path dir))))))
   ;;
   (unless (file-exists-p gmm-image-load-path)
     (error "Directory `%s' in gmm-image-load-path does not exist"

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 32ac738..a98f8a1 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1076,15 +1076,15 @@ See `gmm-tool-bar-from-list' for the format of the list."
   :group 'gnus-group)
 
 (defcustom gnus-group-tool-bar-retro
-  '((gnus-group-get-new-news "get-news")
-    (gnus-group-get-new-news-this-group "gnntg")
-    (gnus-group-catchup-current "catchup")
-    (gnus-group-describe-group "describe-group")
-    (gnus-group-subscribe "subscribe" t
+  '((gnus-group-get-new-news "gnus/get-news")
+    (gnus-group-get-new-news-this-group "gnus/gnntg")
+    (gnus-group-catchup-current "gnus/catchup")
+    (gnus-group-describe-group "gnus/describe-group")
+    (gnus-group-subscribe "gnus/subscribe" t
                          :help "Subscribe to the current group")
-    (gnus-group-unsubscribe "unsubscribe" t
+    (gnus-group-unsubscribe "gnus/unsubscribe" t
                            :help "Unsubscribe from the current group")
-    (gnus-group-exit "exit-gnus" gnus-group-mode-map))
+    (gnus-group-exit "gnus/exit-gnus" gnus-group-mode-map))
   "List of functions for the group tool bar (retro look).
 
 See `gmm-tool-bar-from-list' for the format of the list."

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index a839523..ab5b112 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2698,31 +2698,31 @@ See `gmm-tool-bar-from-list' for the format of the list."
   :group 'gnus-summary)
 
 (defcustom gnus-summary-tool-bar-retro
-  '((gnus-summary-prev-unread-article "prev-ur")
-    (gnus-summary-next-unread-article "next-ur")
-    (gnus-summary-post-news "post")
-    (gnus-summary-followup-with-original "fuwo")
-    (gnus-summary-followup "followup")
-    (gnus-summary-reply-with-original "reply-wo")
-    (gnus-summary-reply "reply")
-    (gnus-summary-caesar-message "rot13")
-    (gnus-uu-decode-uu "uu-decode")
-    (gnus-summary-save-article-file "save-aif")
-    (gnus-summary-save-article "save-art")
-    (gnus-uu-post-news "uu-post")
-    (gnus-summary-catchup "catchup")
-    (gnus-summary-catchup-and-exit "cu-exit")
-    (gnus-summary-exit "exit-summ")
+  '((gnus-summary-prev-unread-article "gnus/prev-ur")
+    (gnus-summary-next-unread-article "gnus/next-ur")
+    (gnus-summary-post-news "gnus/post")
+    (gnus-summary-followup-with-original "gnus/fuwo")
+    (gnus-summary-followup "gnus/followup")
+    (gnus-summary-reply-with-original "gnus/reply-wo")
+    (gnus-summary-reply "gnus/reply")
+    (gnus-summary-caesar-message "gnus/rot13")
+    (gnus-uu-decode-uu "gnus/uu-decode")
+    (gnus-summary-save-article-file "gnus/save-aif")
+    (gnus-summary-save-article "gnus/save-art")
+    (gnus-uu-post-news "gnus/uu-post")
+    (gnus-summary-catchup "gnus/catchup")
+    (gnus-summary-catchup-and-exit "gnus/cu-exit")
+    (gnus-summary-exit "gnus/exit-summ")
     ;; Some new command that may need more suitable icons:
-    (gnus-summary-print-article "print" nil :visible nil)
-    (gnus-summary-mark-as-expirable "close" nil :visible nil)
-    (gnus-summary-save-newsrc "save" nil :visible nil)
-    ;; (gnus-summary-enter-digest-group "right_arrow" nil :visible nil)
-    (gnus-summary-search-article-forward "search" nil :visible nil)
-    ;; (gnus-summary-insert-new-articles "paste" nil :visible nil)
-    ;; (gnus-summary-toggle-threads "open" nil :visible nil)
+    (gnus-summary-print-article "gnus/print" nil :visible nil)
+    (gnus-summary-mark-as-expirable "gnus/close" nil :visible nil)
+    (gnus-summary-save-newsrc "gnus/save" nil :visible nil)
+    ;; (gnus-summary-enter-digest-group "gnus/right_arrow" nil :visible nil)
+    (gnus-summary-search-article-forward "gnus/search" nil :visible nil)
+    ;; (gnus-summary-insert-new-articles "gnus/paste" nil :visible nil)
+    ;; (gnus-summary-toggle-threads "gnus/open" nil :visible nil)
     ;;
-    (gnus-info-find-node "help" nil :visible nil))
+    (gnus-info-find-node "gnus/help" nil :visible nil))
   "List of functions for the summary tool bar (retro look).
 
 See `gmm-tool-bar-from-list' for the format of the list."