From c7ddd701030b5893b7d9616cdb92e6eb377cd2af Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sat, 15 Oct 2005 05:41:11 +0000 Subject: [PATCH] * 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). --- .../gud-break.pbm => etc/images/gud/break.pbm | Bin .../gud-break.xpm => etc/images/gud/break.xpm | 0 .../gud-cont.pbm => etc/images/gud/cont.pbm | Bin .../gud-cont.xpm => etc/images/gud/cont.xpm | 0 .../gud-down.pbm => etc/images/gud/down.pbm | Bin .../gud-down.xpm => etc/images/gud/down.xpm | 0 .../images/gud/finish.pbm | Bin .../images/gud/finish.xpm | 0 .../toolbar/gud-n.pbm => etc/images/gud/n.pbm | Bin .../toolbar/gud-n.xpm => etc/images/gud/n.xpm | 0 .../gud-ni.pbm => etc/images/gud/ni.pbm | Bin .../gud-ni.xpm => etc/images/gud/ni.xpm | 0 .../gud-print.pbm => etc/images/gud/print.pbm | Bin .../gud-print.xpm => etc/images/gud/print.xpm | 0 .../gud-pstar.pbm => etc/images/gud/pstar.pbm | Bin .../gud-pstar.xpm => etc/images/gud/pstar.xpm | 0 .../images/gud/remove.pbm | Bin .../images/gud/remove.xpm | 0 .../gud-run.pbm => etc/images/gud/run.pbm | Bin .../gud-run.xpm => etc/images/gud/run.xpm | 0 .../toolbar/gud-s.pbm => etc/images/gud/s.pbm | Bin .../toolbar/gud-s.xpm => etc/images/gud/s.xpm | 0 .../gud-si.pbm => etc/images/gud/si.pbm | Bin .../gud-si.xpm => etc/images/gud/si.xpm | 0 .../gud-until.pbm => etc/images/gud/until.pbm | Bin .../gud-until.xpm => etc/images/gud/until.xpm | 0 .../gud-up.pbm => etc/images/gud/up.pbm | Bin .../gud-up.xpm => etc/images/gud/up.xpm | 0 .../gud-watch.pbm => etc/images/gud/watch.pbm | Bin .../gud-watch.xpm => etc/images/gud/watch.xpm | 0 lisp/ChangeLog | 21 ++++++++++++ lisp/progmodes/gud.el | 32 +++++++++--------- 32 files changed, 37 insertions(+), 16 deletions(-) rename lisp/toolbar/gud-break.pbm => etc/images/gud/break.pbm (100%) rename lisp/toolbar/gud-break.xpm => etc/images/gud/break.xpm (100%) rename lisp/toolbar/gud-cont.pbm => etc/images/gud/cont.pbm (100%) rename lisp/toolbar/gud-cont.xpm => etc/images/gud/cont.xpm (100%) rename lisp/toolbar/gud-down.pbm => etc/images/gud/down.pbm (100%) rename lisp/toolbar/gud-down.xpm => etc/images/gud/down.xpm (100%) rename lisp/toolbar/gud-finish.pbm => etc/images/gud/finish.pbm (100%) rename lisp/toolbar/gud-finish.xpm => etc/images/gud/finish.xpm (100%) rename lisp/toolbar/gud-n.pbm => etc/images/gud/n.pbm (100%) rename lisp/toolbar/gud-n.xpm => etc/images/gud/n.xpm (100%) rename lisp/toolbar/gud-ni.pbm => etc/images/gud/ni.pbm (100%) rename lisp/toolbar/gud-ni.xpm => etc/images/gud/ni.xpm (100%) rename lisp/toolbar/gud-print.pbm => etc/images/gud/print.pbm (100%) rename lisp/toolbar/gud-print.xpm => etc/images/gud/print.xpm (100%) rename lisp/toolbar/gud-pstar.pbm => etc/images/gud/pstar.pbm (100%) rename lisp/toolbar/gud-pstar.xpm => etc/images/gud/pstar.xpm (100%) rename lisp/toolbar/gud-remove.pbm => etc/images/gud/remove.pbm (100%) rename lisp/toolbar/gud-remove.xpm => etc/images/gud/remove.xpm (100%) rename lisp/toolbar/gud-run.pbm => etc/images/gud/run.pbm (100%) rename lisp/toolbar/gud-run.xpm => etc/images/gud/run.xpm (100%) rename lisp/toolbar/gud-s.pbm => etc/images/gud/s.pbm (100%) rename lisp/toolbar/gud-s.xpm => etc/images/gud/s.xpm (100%) rename lisp/toolbar/gud-si.pbm => etc/images/gud/si.pbm (100%) rename lisp/toolbar/gud-si.xpm => etc/images/gud/si.xpm (100%) rename lisp/toolbar/gud-until.pbm => etc/images/gud/until.pbm (100%) rename lisp/toolbar/gud-until.xpm => etc/images/gud/until.xpm (100%) rename lisp/toolbar/gud-up.pbm => etc/images/gud/up.pbm (100%) rename lisp/toolbar/gud-up.xpm => etc/images/gud/up.xpm (100%) rename lisp/toolbar/gud-watch.pbm => etc/images/gud/watch.pbm (100%) rename lisp/toolbar/gud-watch.xpm => etc/images/gud/watch.xpm (100%) diff --git a/lisp/toolbar/gud-break.pbm b/etc/images/gud/break.pbm similarity index 100% rename from lisp/toolbar/gud-break.pbm rename to etc/images/gud/break.pbm diff --git a/lisp/toolbar/gud-break.xpm b/etc/images/gud/break.xpm similarity index 100% rename from lisp/toolbar/gud-break.xpm rename to etc/images/gud/break.xpm diff --git a/lisp/toolbar/gud-cont.pbm b/etc/images/gud/cont.pbm similarity index 100% rename from lisp/toolbar/gud-cont.pbm rename to etc/images/gud/cont.pbm diff --git a/lisp/toolbar/gud-cont.xpm b/etc/images/gud/cont.xpm similarity index 100% rename from lisp/toolbar/gud-cont.xpm rename to etc/images/gud/cont.xpm diff --git a/lisp/toolbar/gud-down.pbm b/etc/images/gud/down.pbm similarity index 100% rename from lisp/toolbar/gud-down.pbm rename to etc/images/gud/down.pbm diff --git a/lisp/toolbar/gud-down.xpm b/etc/images/gud/down.xpm similarity index 100% rename from lisp/toolbar/gud-down.xpm rename to etc/images/gud/down.xpm diff --git a/lisp/toolbar/gud-finish.pbm b/etc/images/gud/finish.pbm similarity index 100% rename from lisp/toolbar/gud-finish.pbm rename to etc/images/gud/finish.pbm diff --git a/lisp/toolbar/gud-finish.xpm b/etc/images/gud/finish.xpm similarity index 100% rename from lisp/toolbar/gud-finish.xpm rename to etc/images/gud/finish.xpm diff --git a/lisp/toolbar/gud-n.pbm b/etc/images/gud/n.pbm similarity index 100% rename from lisp/toolbar/gud-n.pbm rename to etc/images/gud/n.pbm diff --git a/lisp/toolbar/gud-n.xpm b/etc/images/gud/n.xpm similarity index 100% rename from lisp/toolbar/gud-n.xpm rename to etc/images/gud/n.xpm diff --git a/lisp/toolbar/gud-ni.pbm b/etc/images/gud/ni.pbm similarity index 100% rename from lisp/toolbar/gud-ni.pbm rename to etc/images/gud/ni.pbm diff --git a/lisp/toolbar/gud-ni.xpm b/etc/images/gud/ni.xpm similarity index 100% rename from lisp/toolbar/gud-ni.xpm rename to etc/images/gud/ni.xpm diff --git a/lisp/toolbar/gud-print.pbm b/etc/images/gud/print.pbm similarity index 100% rename from lisp/toolbar/gud-print.pbm rename to etc/images/gud/print.pbm diff --git a/lisp/toolbar/gud-print.xpm b/etc/images/gud/print.xpm similarity index 100% rename from lisp/toolbar/gud-print.xpm rename to etc/images/gud/print.xpm diff --git a/lisp/toolbar/gud-pstar.pbm b/etc/images/gud/pstar.pbm similarity index 100% rename from lisp/toolbar/gud-pstar.pbm rename to etc/images/gud/pstar.pbm diff --git a/lisp/toolbar/gud-pstar.xpm b/etc/images/gud/pstar.xpm similarity index 100% rename from lisp/toolbar/gud-pstar.xpm rename to etc/images/gud/pstar.xpm diff --git a/lisp/toolbar/gud-remove.pbm b/etc/images/gud/remove.pbm similarity index 100% rename from lisp/toolbar/gud-remove.pbm rename to etc/images/gud/remove.pbm diff --git a/lisp/toolbar/gud-remove.xpm b/etc/images/gud/remove.xpm similarity index 100% rename from lisp/toolbar/gud-remove.xpm rename to etc/images/gud/remove.xpm diff --git a/lisp/toolbar/gud-run.pbm b/etc/images/gud/run.pbm similarity index 100% rename from lisp/toolbar/gud-run.pbm rename to etc/images/gud/run.pbm diff --git a/lisp/toolbar/gud-run.xpm b/etc/images/gud/run.xpm similarity index 100% rename from lisp/toolbar/gud-run.xpm rename to etc/images/gud/run.xpm diff --git a/lisp/toolbar/gud-s.pbm b/etc/images/gud/s.pbm similarity index 100% rename from lisp/toolbar/gud-s.pbm rename to etc/images/gud/s.pbm diff --git a/lisp/toolbar/gud-s.xpm b/etc/images/gud/s.xpm similarity index 100% rename from lisp/toolbar/gud-s.xpm rename to etc/images/gud/s.xpm diff --git a/lisp/toolbar/gud-si.pbm b/etc/images/gud/si.pbm similarity index 100% rename from lisp/toolbar/gud-si.pbm rename to etc/images/gud/si.pbm diff --git a/lisp/toolbar/gud-si.xpm b/etc/images/gud/si.xpm similarity index 100% rename from lisp/toolbar/gud-si.xpm rename to etc/images/gud/si.xpm diff --git a/lisp/toolbar/gud-until.pbm b/etc/images/gud/until.pbm similarity index 100% rename from lisp/toolbar/gud-until.pbm rename to etc/images/gud/until.pbm diff --git a/lisp/toolbar/gud-until.xpm b/etc/images/gud/until.xpm similarity index 100% rename from lisp/toolbar/gud-until.xpm rename to etc/images/gud/until.xpm diff --git a/lisp/toolbar/gud-up.pbm b/etc/images/gud/up.pbm similarity index 100% rename from lisp/toolbar/gud-up.pbm rename to etc/images/gud/up.pbm diff --git a/lisp/toolbar/gud-up.xpm b/etc/images/gud/up.xpm similarity index 100% rename from lisp/toolbar/gud-up.xpm rename to etc/images/gud/up.xpm diff --git a/lisp/toolbar/gud-watch.pbm b/etc/images/gud/watch.pbm similarity index 100% rename from lisp/toolbar/gud-watch.pbm rename to etc/images/gud/watch.pbm diff --git a/lisp/toolbar/gud-watch.xpm b/etc/images/gud/watch.xpm similarity index 100% rename from lisp/toolbar/gud-watch.xpm rename to 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 + + * 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 * 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 -- 2.39.5