32 files changed, 37 insertions, 16 deletions

diff --git a/lisp/toolbar/gud-break.pbm b/etc/images/gud/break.pbm
index ff28ff8649f..ff28ff8649f 100644
--- a/lisp/toolbar/gud-break.pbm
+++ b/etc/images/gud/break.pbm
diff --git a/lisp/toolbar/gud-break.xpm b/etc/images/gud/break.xpm
index 2ffc2748271..2ffc2748271 100644
--- a/lisp/toolbar/gud-break.xpm
+++ b/etc/images/gud/break.xpm
diff --git a/lisp/toolbar/gud-cont.pbm b/etc/images/gud/cont.pbm
index bc6dbead648..bc6dbead648 100644
--- a/lisp/toolbar/gud-cont.pbm
+++ b/etc/images/gud/cont.pbm
diff --git a/lisp/toolbar/gud-cont.xpm b/etc/images/gud/cont.xpm
index 9da91af994f..9da91af994f 100644
--- a/lisp/toolbar/gud-cont.xpm
+++ b/etc/images/gud/cont.xpm
diff --git a/lisp/toolbar/gud-down.pbm b/etc/images/gud/down.pbm
index c76dad2e04f..c76dad2e04f 100644
--- a/lisp/toolbar/gud-down.pbm
+++ b/etc/images/gud/down.pbm
diff --git a/lisp/toolbar/gud-down.xpm b/etc/images/gud/down.xpm
index 30f3af89cce..30f3af89cce 100644
--- a/lisp/toolbar/gud-down.xpm
+++ b/etc/images/gud/down.xpm
diff --git a/lisp/toolbar/gud-finish.pbm b/etc/images/gud/finish.pbm
index 324245235c9..324245235c9 100644
--- a/lisp/toolbar/gud-finish.pbm
+++ b/etc/images/gud/finish.pbm
diff --git a/lisp/toolbar/gud-finish.xpm b/etc/images/gud/finish.xpm
index 0310f07e8da..0310f07e8da 100644
--- a/lisp/toolbar/gud-finish.xpm
+++ b/etc/images/gud/finish.xpm
diff --git a/lisp/toolbar/gud-n.pbm b/etc/images/gud/n.pbm
index dc2a15323e3..dc2a15323e3 100644
--- a/lisp/toolbar/gud-n.pbm
+++ b/etc/images/gud/n.pbm
diff --git a/lisp/toolbar/gud-n.xpm b/etc/images/gud/n.xpm
index f0257da5cf0..f0257da5cf0 100644
--- a/lisp/toolbar/gud-n.xpm
+++ b/etc/images/gud/n.xpm
diff --git a/lisp/toolbar/gud-ni.pbm b/etc/images/gud/ni.pbm
index ecad2965b0d..ecad2965b0d 100644
--- a/lisp/toolbar/gud-ni.pbm
+++ b/etc/images/gud/ni.pbm
diff --git a/lisp/toolbar/gud-ni.xpm b/etc/images/gud/ni.xpm
index bd4f02db12e..bd4f02db12e 100644
--- a/lisp/toolbar/gud-ni.xpm
+++ b/etc/images/gud/ni.xpm
diff --git a/lisp/toolbar/gud-print.pbm b/etc/images/gud/print.pbm
index d6ab68f39ad..d6ab68f39ad 100644
--- a/lisp/toolbar/gud-print.pbm
+++ b/etc/images/gud/print.pbm
diff --git a/lisp/toolbar/gud-print.xpm b/etc/images/gud/print.xpm
index e1e7c623355..e1e7c623355 100644
--- a/lisp/toolbar/gud-print.xpm
+++ b/etc/images/gud/print.xpm
diff --git a/lisp/toolbar/gud-pstar.pbm b/etc/images/gud/pstar.pbm
index 1f5967107a0..1f5967107a0 100644
--- a/lisp/toolbar/gud-pstar.pbm
+++ b/etc/images/gud/pstar.pbm
diff --git a/lisp/toolbar/gud-pstar.xpm b/etc/images/gud/pstar.xpm
index 6edc603db14..6edc603db14 100644
--- a/lisp/toolbar/gud-pstar.xpm
+++ b/etc/images/gud/pstar.xpm
diff --git a/lisp/toolbar/gud-remove.pbm b/etc/images/gud/remove.pbm
index 516bec1f785..516bec1f785 100644
--- a/lisp/toolbar/gud-remove.pbm
+++ b/etc/images/gud/remove.pbm
diff --git a/lisp/toolbar/gud-remove.xpm b/etc/images/gud/remove.xpm
index 5f38bd416ed..5f38bd416ed 100644
--- a/lisp/toolbar/gud-remove.xpm
+++ b/etc/images/gud/remove.xpm
diff --git a/lisp/toolbar/gud-run.pbm b/etc/images/gud/run.pbm
index 8bde32c3391..8bde32c3391 100644
--- a/lisp/toolbar/gud-run.pbm
+++ b/etc/images/gud/run.pbm
diff --git a/lisp/toolbar/gud-run.xpm b/etc/images/gud/run.xpm
index ef29662ed24..ef29662ed24 100644
--- a/lisp/toolbar/gud-run.xpm
+++ b/etc/images/gud/run.xpm
diff --git a/lisp/toolbar/gud-s.pbm b/etc/images/gud/s.pbm
index de7caa50ed5..de7caa50ed5 100644
--- a/lisp/toolbar/gud-s.pbm
+++ b/etc/images/gud/s.pbm
diff --git a/lisp/toolbar/gud-s.xpm b/etc/images/gud/s.xpm
index 4ee3eccaee2..4ee3eccaee2 100644
--- a/lisp/toolbar/gud-s.xpm
+++ b/etc/images/gud/s.xpm
diff --git a/lisp/toolbar/gud-si.pbm b/etc/images/gud/si.pbm
index eed55cc4a33..eed55cc4a33 100644
--- a/lisp/toolbar/gud-si.pbm
+++ b/etc/images/gud/si.pbm
diff --git a/lisp/toolbar/gud-si.xpm b/etc/images/gud/si.xpm
index b20eb6243f7..b20eb6243f7 100644
--- a/lisp/toolbar/gud-si.xpm
+++ b/etc/images/gud/si.xpm
diff --git a/lisp/toolbar/gud-until.pbm b/etc/images/gud/until.pbm
index 096cacc6c17..096cacc6c17 100644
--- a/lisp/toolbar/gud-until.pbm
+++ b/etc/images/gud/until.pbm
diff --git a/lisp/toolbar/gud-until.xpm b/etc/images/gud/until.xpm
index f82da6700b2..f82da6700b2 100644
--- a/lisp/toolbar/gud-until.xpm
+++ b/etc/images/gud/until.xpm
diff --git a/lisp/toolbar/gud-up.pbm b/etc/images/gud/up.pbm
index 585f488bac7..585f488bac7 100644
--- a/lisp/toolbar/gud-up.pbm
+++ b/etc/images/gud/up.pbm
diff --git a/lisp/toolbar/gud-up.xpm b/etc/images/gud/up.xpm
index c2e4c9f8ff4..c2e4c9f8ff4 100644
--- a/lisp/toolbar/gud-up.xpm
+++ b/etc/images/gud/up.xpm
diff --git a/lisp/toolbar/gud-watch.pbm b/etc/images/gud/watch.pbm
index 223d4ebf8c7..223d4ebf8c7 100644
--- a/lisp/toolbar/gud-watch.pbm
+++ b/etc/images/gud/watch.pbm
diff --git a/lisp/toolbar/gud-watch.xpm b/etc/images/gud/watch.xpm
index 52052212390..52052212390 100644
--- a/lisp/toolbar/gud-watch.xpm
+++ b/etc/images/gud/watch.xpm
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b7032c63c2..ae3c3ed4fe4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        * toolbar/gud-break.*: Moved to etc/images/gud/break.*.
+        * toolbar/gud-cont.*: Moved to etc/images/gud/cont.*.
+        * toolbar/gud-down.*: Moved to etc/images/gud/down.*.
+        * toolbar/gud-finish.*: Moved to etc/images/gud/finish.*.
+        * toolbar/gud-ni.*: Moved to etc/images/gud/ni.*.
+        * toolbar/gud-n.*: Moved to etc/images/gud/n.*.
+        * toolbar/gud-print.*: Moved to etc/images/gud/print.*.
+        * toolbar/gud-pstar.*: Moved to etc/images/gud/pstar.*.
+        * toolbar/gud-remove.*: Moved to etc/images/gud/remove.*.
+        * toolbar/gud-run.*: Moved to etc/images/gud/run.*.
+        * toolbar/gud-si.*: Moved to etc/images/gud/si.*.
+        * toolbar/gud-s.*: Moved to etc/images/gud/s.*.
+        * toolbar/gud-until.*: Moved to etc/images/gud/until.*.
+        * toolbar/gud-up.*: Moved to etc/images/gud/up.*.
+        * toolbar/gud-watch.*: Moved to etc/images/gud/watch.*.
+
+        * progmodes/gud.el (gud-tool-bar-map): Renamed the images
+        appropriately (for example, gud-break to gud/break).
+
 2005-10-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * longlines.el (longlinges-search-function)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index d38697a2152..13acc893c23 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -5,7 +5,7 @@
 ;; Keywords: unix, tools
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;;  2004, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -197,24 +197,24 @@ Used to grey out relevant togolbar icons.")
 (defvar gud-tool-bar-map
   (if (display-graphic-p)
       (let ((map (make-sparse-keymap)))
-        (dolist (x '((gud-break . "gud-break")
-                     (gud-remove . "gud-remove")
-                     (gud-print . "gud-print")
-                     (gud-pstar . "gud-pstar")
-                     (gud-watch . "gud-watch")
-                     (gud-cont . "gud-cont")
-                     (gud-until . "gud-until")
-                     (gud-finish . "gud-finish")
-                     (gud-run . "gud-run")
+        (dolist (x '((gud-break . "gud/break")
+                     (gud-remove . "gud/remove")
+                     (gud-print . "gud/print")
+                     (gud-pstar . "gud/pstar")
+                     (gud-watch . "gud/watch")
+                     (gud-cont . "gud/cont")
+                     (gud-until . "gud/until")
+                     (gud-finish . "gud/finish")
+                     (gud-run . "gud/run")
                      ;; gud-s, gud-si etc. instead of gud-step,
                      ;; gud-stepi, to avoid file-name clashes on DOS
                      ;; 8+3 filesystems.
-                     (gud-next . "gud-n")
-                     (gud-step . "gud-s")
-                     (gud-nexti . "gud-ni")
-                     (gud-stepi . "gud-si")
-                     (gud-up . "gud-up")
-                     (gud-down . "gud-down")
+                     (gud-next . "gud/n")
+                     (gud-step . "gud/s")
+                     (gud-nexti . "gud/ni")
+                     (gud-stepi . "gud/si")
+                     (gud-up . "gud/up")
+                     (gud-down . "gud/down")
                      (gud-goto-info . "info"))
                    map)
           (tool-bar-local-item-from-menu