From 32759db597d9c02f23e557a628ee76ad230c096f Mon Sep 17 00:00:00 2001
From: Nick Roberts <nickrob@snap.net.nz>
Date: Sun, 5 Jun 2005 07:54:50 +0000
Subject: [PATCH] (gdb, gud-menu-map): Add command to evaluate  C dereferenced
 pointer expression. (gud-tool-bar-map): Put it on the tool bar.

---
 lisp/ChangeLog        |  2 +-
 lisp/progmodes/gud.el | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f768fb526..8e33fcfc3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,7 +6,7 @@
 
 	* progmodes/gud.el (gdb, gud-menu-map): Add command to evaluate
 	 C dereferenced pointer expression.
-	(gud-tool-bar-map): Put it on the tool bar.
+	(gud-tool-bar-map): Put it on the tool bar.  Re-order icons.
 
 	* toolbar/gud-pstar.xpm, toolbar/gud-pstar.pbm: New files.
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 31b9e7d720..f3a95514c1 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -140,6 +140,9 @@ Used to grey out relevant togolbar icons.")
 		  :enable (and (not gud-running)
 			       (memq gud-minor-mode
 				     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
+    ([print*]	menu-item "Print Dereference" gud-pstar
+                     :enable (and (not gud-running)
+				  (memq gud-minor-mode '(gdbmi gdba gdb))))
     ([print]	menu-item "Print Expression" gud-print
                      :enable (not gud-running))
     ([watch]	menu-item "Watch Expression" gud-watch
@@ -183,18 +186,19 @@ Used to grey out relevant togolbar icons.")
 	(dolist (x '((gud-break . "gud-break")
 		     (gud-remove . "gud-remove")
 		     (gud-print . "gud-print")
+		     (gud-pstar . "gud-pstar")
 		     (gud-watch . "gud-watch")
-		     (gud-run . "gud-run")
-		     (gud-until . "gud-until")
 		     (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-step . "gud-s")
 		     (gud-next . "gud-n")
-		     (gud-finish . "gud-finish")
-		     (gud-stepi . "gud-si")
+		     (gud-step . "gud-s")
 		     (gud-nexti . "gud-ni")
+		     (gud-stepi . "gud-si")
 		     (gud-up . "gud-up")
 		     (gud-down . "gud-down")
 		     (gud-goto-info . "info"))
@@ -580,6 +584,8 @@ and source-file directory for your debugger."
   (gud-def gud-up     "up %p"        "<" "Up N stack frames (numeric arg).")
   (gud-def gud-down   "down %p"      ">" "Down N stack frames (numeric arg).")
   (gud-def gud-print  "print %e"     "\C-p" "Evaluate C expression at point.")
+  (gud-def gud-pstar  "print* %e"    nil
+	   "Evaluate C dereferenced pointer expression at point.")
   (gud-def gud-until  "until %l"     "\C-u" "Continue to current line.")
   (gud-def gud-run    "run"	     nil    "Run the program.")
 
-- 
2.39.2