[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.72 emacs/lisp/progmodes/gud.el:1.73
*** emacs/lisp/progmodes/gud.el:1.72    Tue Nov 15 22:55:48 2005
--- emacs/lisp/progmodes/gud.el Wed Nov 16 00:55:52 2005
***************
*** 127,132 ****
--- 127,139 ----
           (and (memq gud-minor-mode '(gdbmi gdba))
                (> (car (window-fringes)) 0)))))
  
+ (defun gud-stop-subjob ()
+   (interactive)
+   (if (string-equal
+        (buffer-local-value 'gud-target-name gud-comint-buffer) "emacs")
+       (comint-stop-subjob)
+     (comint-interrupt-subjob)))
+ 
  (easy-mmode-defmap gud-menu-map
    '(([help]     "Info" . gud-goto-info)
      ([tooltips] menu-item "Toggle GUD tooltips" gud-tooltip-mode
***************
*** 142,148 ****
      ([go]     menu-item "Run/Continue" gud-go
                  :visible (and (not gud-running)
                                (eq gud-minor-mode 'gdba)))
!     ([stop]   menu-item "Stop" comint-stop-subjob
                  :visible (or (not (eq gud-minor-mode 'gdba))
                               (and gud-running
                                    (eq gud-minor-mode 'gdba))))
--- 149,155 ----
      ([go]     menu-item "Run/Continue" gud-go
                  :visible (and (not gud-running)
                                (eq gud-minor-mode 'gdba)))
!     ([stop]   menu-item "Stop" gud-stop-subjob
                  :visible (or (not (eq gud-minor-mode 'gdba))
                               (and gud-running
                                    (eq gud-minor-mode 'gdba))))
***************
*** 168,204 ****
                               (memq gud-minor-mode
                                     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
      ([pp]     menu-item "Print the emacs s-expression" gud-pp
!                      :enable (and (not gud-running)
                                  gdb-active-process)
!                    :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))))
      ([print]  menu-item "Print Expression" gud-print
!                      :enable (not gud-running))
      ([watch]  menu-item "Watch Expression" gud-watch
!                    :enable (and (not gud-running)
!                                 (memq gud-minor-mode '(gdbmi gdba))))
!     ([finish] menu-item "Finish Function" gud-finish
!                    :enable (and (not gud-running)
!                                 (memq gud-minor-mode
!                                       '(gdbmi gdba gdb xdb jdb pdb bashdb))))
      ([stepi]  menu-item "Step Instruction" gud-stepi
!                      :enable (and (not gud-running)
!                                 (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
      ([nexti]  menu-item "Next Instruction" gud-nexti
!                      :enable (and (not gud-running)
!                                 (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
      ([step]   menu-item "Step Line" gud-step
!                      :enable (not gud-running))
      ([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")
  
--- 175,208 ----
                               (memq gud-minor-mode
                                     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
      ([pp]     menu-item "Print the emacs s-expression" gud-pp
!                   :enable (and (not gud-running)
                                  gdb-active-process)
!                 :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))))
      ([print]  menu-item "Print Expression" gud-print
!                   :enable (not gud-running))
      ([watch]  menu-item "Watch Expression" gud-watch
!                 :enable (and (not gud-running)
!                              (memq gud-minor-mode
!                                    '(gdbmi gdba gdb xdb jdb pdb bashdb))))
      ([stepi]  menu-item "Step Instruction" gud-stepi
!                   :enable (and (not gud-running)
!                              (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
      ([nexti]  menu-item "Next Instruction" gud-nexti
!                   :enable (and (not gud-running)
!                              (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
      ([step]   menu-item "Step Line" gud-step
!                   :enable (not gud-running))
      ([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")
  
***************
*** 226,232 ****
                     (gud-watch . "gud/watch")
                     (gud-run . "gud/run")
                     (gud-go . "gud/go")
!                    (comint-stop-subjob . "gud/stop")
                     ;; gud-s, gud-si etc. instead of gud-step,
                     ;; gud-stepi, to avoid file-name clashes on DOS
                     ;; 8+3 filesystems.
--- 230,236 ----
                     (gud-watch . "gud/watch")
                     (gud-run . "gud/run")
                     (gud-go . "gud/go")
!                    (gud-stop-subjob . "gud/stop")
                     ;; gud-s, gud-si etc. instead of gud-step,
                     ;; gud-stepi, to avoid file-name clashes on DOS
                     ;; 8+3 filesystems.