(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 --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 0365ed1d4f70083f8f6e521cbf68896b9b2f05ef..64c52101fd6876078510c59948ee879b9c13f6db 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -137,21 +137,18 @@ Used to grey out relevant togolbar icons.")
                   :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 @@ required by the caller."
                (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