Further changes from EMACS_23_1_RC branch (2009-12-29 contd).

* term/x-win.el (x-gtk-stock-map): Map some GUD buttons.
* progmodes/gud.el (gud-menu-map): Add reverse-execution commands.

2 files changed, 15 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d78d53c81c..f12bc9c0856 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-31  Nick Roberts  <nickrob@snap.net.nz>
+
+        Further changes from EMACS_23_1_RC branch (2009-12-29 contd).
+        * term/x-win.el (x-gtk-stock-map): Map some GUD buttons.
+        * progmodes/gud.el (gud-menu-map): Add reverse-execution commands.
+
 2009-12-30  Nick Roberts  <nickrob@snap.net.nz>
 
         Show working revision correctly for mercurial.
@@ -11,6 +17,11 @@
         (speedbar-timer-fn, speedbar-change-expand-button-char)
         (speedbar-delete-subblock, speedbar-center-buffer-smartly): Declare.
 
+2009-12-29  Nick Roberts  <nickrob@snap.net.nz>
+
+        This changeset reverts GDB Graphical Interface to use annotations.
+        * progmodes/gdb-ui.el, progmodes/gud.el: Import from EMACS_23_1_RC.
+
 2009-12-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Make vc-dir work on subdirectories of the bzr root.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 8daa6fed989..21f695bd9aa 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1636,6 +1636,10 @@ The value nil is the same as this list:
     ("images/mail/save-draft" . "gtk-mail-handling")
     ("images/mail/send" . "gtk-mail-send")
     ("images/mail/spam" . "gtk-spam")
+    ;; Used for GDB Graphical Interface
+    ("images/gud/break" . "gtk-no")
+    ("images/gud/recstart" . "gtk-media-record")
+    ("images/gud/recstop" . "gtk-media-stop")
     ;; No themed versions available:
     ;; mail/preview (combining stock_mail and stock_zoom)
     ;; mail/save    (combining stock_mail, stock_save and stock_convert)