# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1131830815 0
# Node ID b32f2be3a5c8dcc6c654a3b73b37fc73d27a3131
# Parent  e2e80863801ad749f3e8076ed8fd0ece3ab9d3f3
(gud-menu-map): Revert to window-fringes for
selected window.  This still doesn't work for speedbar.
(gud-speedbar-buttons): Handle string expressions properly.

diff -r e2e80863801a -r b32f2be3a5c8 lisp/progmodes/gud.el
--- a/lisp/progmodes/gud.el	Sat Nov 12 21:21:51 2005 +0000
+++ b/lisp/progmodes/gud.el	Sat Nov 12 21:26:55 2005 +0000
@@ -137,21 +137,18 @@
                   :enable (and (not gud-running)
 			       (memq gud-minor-mode '(gdbmi gdba gdb perldb)))
 		  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
-                     (> (car (window-fringes
-			      (get-buffer-window (current-buffer)))) 0))))
+                     (> (car (window-fringes 0))))))
     ([remove]	menu-item "Remove Breakpoint" gud-remove
                   :enable (not gud-running)
 		  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
-                     (> (car (window-fringes
-			      (get-buffer-window (current-buffer)))) 0))))
+                      (> (car (window-fringes 0))))))
     ([tbreak]	menu-item "Temporary Breakpoint" gud-tbreak
 		  :enable (memq gud-minor-mode
 				'(gdbmi gdba gdb sdb xdb bashdb)))
     ([break]	menu-item "Set Breakpoint" gud-break
                   :enable (not gud-running)
 		  :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
-                     (> (car (window-fringes
-			      (get-buffer-window (current-buffer)))) 0))))
+                      (> (car (window-fringes 0))))))
     ([up]	menu-item "Up Stack" gud-up
 		  :enable (and (not gud-running)
 			       (memq gud-minor-mode
@@ -425,7 +422,9 @@
 		(while (string-match "\\." varnum start)
 		  (setq depth (1+ depth)
 			start (1+ (match-beginning 0))))
-		(if (equal (nth 2 var) "0")
+		(if (or (equal (nth 2 var) "0")
+			(and (equal (nth 2 var) "1")
+			     (equal (nth 3 var) "char *")))
 		    (speedbar-make-tag-line 'bracket ?? nil nil
 					    (concat (car var) "\t" (nth 4 var))
 					    'gdb-edit-value