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

[Nick Roberts]

Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.61 emacs/lisp/progmodes/gdb-ui.el:1.62
*** emacs/lisp/progmodes/gdb-ui.el:1.61 Tue Apr 26 21:25:55 2005
--- emacs/lisp/progmodes/gdb-ui.el      Wed Apr 27 22:00:22 2005
***************
*** 82,87 ****
--- 82,89 ----
  (defvar gdb-location-alist nil
    "Alist of breakpoint numbers and full filenames.")
  (defvar gdb-find-file-unhook nil)
+ (defvar gdb-active-process nil "GUD tooltips display variable values when t, \
+ and #define directives otherwise.")
  
  (defvar gdb-buffer-type nil
    "One of the symbols bound in `gdb-buffer-rules'.")
***************
*** 776,783 ****
      ("post-prompt" gdb-post-prompt)
      ("source" gdb-source)
      ("starting" gdb-starting)
!     ("exited" gdb-stopping)
!     ("signalled" gdb-stopping)
      ("signal" gdb-stopping)
      ("breakpoint" gdb-stopping)
      ("watchpoint" gdb-stopping)
--- 778,785 ----
      ("post-prompt" gdb-post-prompt)
      ("source" gdb-source)
      ("starting" gdb-starting)
!     ("exited" gdb-exited)
!     ("signalled" gdb-exited)
      ("signal" gdb-stopping)
      ("breakpoint" gdb-stopping)
      ("watchpoint" gdb-stopping)
***************
*** 853,858 ****
--- 855,861 ----
    "An annotation handler for `starting'.
  This says that I/O for the subprocess is now the program being debugged,
  not GDB."
+   (setq gdb-active-process t)
    (let ((sink gdb-output-sink))
      (cond
       ((eq sink 'user)
***************
*** 865,871 ****
        (error "Unexpected `starting' annotation")))))
  
  (defun gdb-stopping (ignored)
!   "An annotation handler for `exited' and other annotations.
  They say that I/O for the subprocess is now GDB, not the program
  being debugged."
    (if gdb-use-inferior-io-buffer
--- 868,874 ----
        (error "Unexpected `starting' annotation")))))
  
  (defun gdb-stopping (ignored)
!   "An annotation handler for `breakpoint' and other annotations.
  They say that I/O for the subprocess is now GDB, not the program
  being debugged."
    (if gdb-use-inferior-io-buffer
***************
*** 877,882 ****
--- 880,895 ----
          (gdb-resync)
          (error "Unexpected stopping annotation"))))))
  
+ (defun gdb-exited (ignored)
+   "An annotation handler for `exited' and `signalled'.
+ They say that I/O for the subprocess is now GDB, not the program
+ being debugged and that the program is no longer running. This
+ function is used to change the focus of GUD tooltips to #define
+ directives."
+   (setq gdb-active-process nil)
+   (gdb-stopping ignored))
+  
+ 
  (defun gdb-frame-begin (ignored)
    (let ((sink gdb-output-sink))
      (cond
***************
*** 2140,2146 ****
              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
              (setq gud-minor-mode nil)
              (kill-local-variable 'tool-bar-map)
!             (setq gud-running nil))))))
    (when (markerp gdb-overlay-arrow-position)
      (move-marker gdb-overlay-arrow-position nil)
      (setq gdb-overlay-arrow-position nil))
--- 2153,2160 ----
              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
              (setq gud-minor-mode nil)
              (kill-local-variable 'tool-bar-map)
!             (setq gud-running nil)
!             (setq gdb-active-process nil))))))
    (when (markerp gdb-overlay-arrow-position)
      (move-marker gdb-overlay-arrow-position nil)
      (setq gdb-overlay-arrow-position nil))