From: Nick Roberts Date: Wed, 30 Dec 2009 13:19:53 +0000 (+1300) Subject: Further changes from EMACS_23_1_RC branch (2009-12-29 contd). X-Git-Tag: emacs-pretest-23.1.91~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ee6c59b15451c40d5eec3844543391ee07f3afd;p=emacs.git 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. --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f6dfdc91e0f..8d7b5383d72 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -6,6 +6,11 @@ * mini.texi (Completion Options): Mention `initals' completion style. +2009-12-29 Nick Roberts + + * building.texi: Import GDB Graphical Interface description from + EMACS_23_1_RC. + 2009-12-24 Chong Yidong * emacs.texi (Top): Update node listing. diff --git a/etc/images/gud/README b/etc/images/gud/README index b929ad480f4..b7defffc46d 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README @@ -7,8 +7,10 @@ License: GNU General Public License version 3 or later (see COPYING) break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm break.xpm, nexti.xpm, go.xpm, pp.xpm, print.xpm, pstar.xpm, remove.xpm - stepi.pbm, until.pbm - stepi.xpm, until.xpm + stepi.pbm, until.pbm, stepi.xpm, until.xpm + rnexti.xpm rstepi.xpm + recstart.xpm recstop.xpm + Some icons are derived from Red Hat's Insight Debugger: @@ -44,9 +46,12 @@ License: GNU General Public License version 3 or later (see COPYING) up.pbm and up.xpm were converted from up.gif watch.pbm and watch.xpm were converted from watch.gif -The following icons were created by Dmitry Dzhus . -Copyright (C) 2009 +The following icons are created from the Insight Windows style icon +set in src/gdb/gdbtk/library/images2. + +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) - - all.xpm, thread.xpm + + rcont.xpm rfinish.xpm + rnext.xpm rstep.xpm 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 + + 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 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 + + 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 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)