[Emacs-diffs] Changes to emacs/lisp/progmodes/gud.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gud.el
diff -c emacs/lisp/progmodes/gud.el:1.69 emacs/lisp/progmodes/gud.el:1.70
*** emacs/lisp/progmodes/gud.el:1.69    Sun Nov 13 09:03:36 2005
--- emacs/lisp/progmodes/gud.el Tue Nov 15 12:27:29 2005
***************
*** 122,127 ****
--- 122,132 ----
        (info "(emacs)GDB Graphical Interface")
        (info "(emacs)Debuggers"))))
  
+ (defun gud-tool-bar-item-visible-no-fringe ()
+   (not (or (eq (buffer-local-value 'major-mode (window-buffer)) 
'speedbar-mode)
+          (and (memq gud-minor-mode '(gdbmi gdba))
+               (> (car (window-fringes)) 0)))))
+ 
  (easy-mmode-defmap gud-menu-map
    '(([help]     "Info" . gud-goto-info)
      ([tooltips] menu-item "Toggle GUD tooltips" gud-tooltip-mode
***************
*** 132,154 ****
      ([refresh]        "Refresh" . gud-refresh)
      ([run]    menu-item "Run" gud-run
                    :enable (and (not gud-running)
!                              (memq gud-minor-mode '(gdbmi gdba gdb dbx jdb))))
      ([until]  menu-item "Continue to selection" gud-until
                    :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)) 0))))
      ([remove] menu-item "Remove Breakpoint" gud-remove
                    :enable (not gud-running)
!                 :visible (not (and (memq gud-minor-mode '(gdbmi gdba))
!                       (> (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)) 0))))
      ([up]     menu-item "Up Stack" gud-up
                  :enable (and (not gud-running)
                               (memq gud-minor-mode
--- 137,162 ----
      ([refresh]        "Refresh" . gud-refresh)
      ([run]    menu-item "Run" gud-run
                    :enable (and (not gud-running)
!                              (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
!                 :visible (not (eq gud-minor-mode 'gdba)))
!     ([go]     menu-item "Run/Continue" gud-go
!                   :enable (not gud-running)
!                 :visible (eq gud-minor-mode 'gdba))
!     ([stop]   menu-item "Stop" comint-interrupt-subjob
!                   :enable gud-running)
      ([until]  menu-item "Continue to selection" gud-until
                    :enable (and (not gud-running)
                               (memq gud-minor-mode '(gdbmi gdba gdb perldb)))
!                 :visible (gud-tool-bar-item-visible-no-fringe))
      ([remove] menu-item "Remove Breakpoint" gud-remove
                    :enable (not gud-running)
!                 :visible (gud-tool-bar-item-visible-no-fringe))
      ([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 (gud-tool-bar-item-visible-no-fringe))
      ([up]     menu-item "Up Stack" gud-up
                  :enable (and (not gud-running)
                               (memq gud-minor-mode
***************
*** 163,169 ****
                     :visible (and (string-equal
                                  (buffer-local-value
                                   'gud-target-name gud-comint-buffer) "emacs")
!                                  (memq gud-minor-mode '(gdbmi gdba))))
      ([print*] menu-item "Print Dereference" gud-pstar
                       :enable (and (not gud-running)
                                  (memq gud-minor-mode '(gdbmi gdba gdb))))
--- 171,177 ----
                     :visible (and (string-equal
                                  (buffer-local-value
                                   'gud-target-name gud-comint-buffer) "emacs")
!                                  (eq gud-minor-mode 'gdba)))
      ([print*] menu-item "Print Dereference" gud-pstar
                       :enable (and (not gud-running)
                                  (memq gud-minor-mode '(gdbmi gdba gdb))))
***************
*** 187,193 ****
      ([next]   menu-item "Next Line" gud-next
                       :enable (not gud-running))
      ([cont]   menu-item "Continue" gud-cont
!                      :enable (not gud-running)))
    "Menu for `gud-mode'."
    :name "Gud")
  
--- 195,202 ----
      ([next]   menu-item "Next Line" gud-next
                       :enable (not gud-running))
      ([cont]   menu-item "Continue" gud-cont
!                      :enable (not gud-running)
!                    :visible (not (eq gud-minor-mode 'gdba))))
    "Menu for `gud-mode'."
    :name "Gud")
  
***************
*** 213,222 ****
                     (gud-pstar . "gud/pstar")
                     (gud-pp . "gud/pp")
                     (gud-watch . "gud/watch")
-                    (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.
--- 222,233 ----
                     (gud-pstar . "gud/pstar")
                     (gud-pp . "gud/pp")
                     (gud-watch . "gud/watch")
                     (gud-finish . "gud/finish")
+                    (gud-until . "gud/until")
+                    (gud-cont . "gud/cont")
                     (gud-run . "gud/run")
+                    (gud-go . "gud/go")
+                    (comint-interrupt-subjob . "gud/stop")
                     ;; gud-s, gud-si etc. instead of gud-step,
                     ;; gud-stepi, to avoid file-name clashes on DOS
                     ;; 8+3 filesystems.