[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.29 emacs/lisp/progmodes/gdb-ui.el:1.30
*** emacs/lisp/progmodes/gdb-ui.el:1.29 Sat Nov  6 16:07:10 2004
--- emacs/lisp/progmodes/gdb-ui.el      Mon Nov  8 21:16:33 2004
***************
*** 60,65 ****
--- 60,66 ----
  (defvar gdb-previous-address nil)
  (defvar gdb-previous-frame nil)
  (defvar gdb-current-frame nil)
+ (defvar gdb-current-stack-level nil)
  (defvar gdb-current-language nil)
  (defvar gdb-view-source t "Non-nil means that source code can be viewed.")
  (defvar gdb-selected-view 'source "Code type that user wishes to view.")
***************
*** 183,188 ****
--- 184,190 ----
    (setq gdb-previous-address nil)
    (setq gdb-previous-frame nil)
    (setq gdb-current-frame nil)
+   (setq gdb-current-stack-level nil)
    (setq gdb-view-source t)
    (setq gdb-selected-view 'source)
    (setq gdb-var-list nil)
***************
*** 393,399 ****
    "If non-nil highlight values that have recently changed in the speedbar.
  The highlighting is done with `font-lock-warning-face'."
    :type 'boolean
!   :group 'gud)
  
  (defun gdb-speedbar-expand-node (text token indent)
    "Expand the node the user clicked on.
--- 395,402 ----
    "If non-nil highlight values that have recently changed in the speedbar.
  The highlighting is done with `font-lock-warning-face'."
    :type 'boolean
!   :group 'gud
!   :version "21.4")
  
  (defun gdb-speedbar-expand-node (text token indent)
    "Expand the node the user clicked on.
***************
*** 1291,1299 ****
                             '(mouse-face highlight
                               help-echo "mouse-2, RET: Select frame"))
          (beginning-of-line)
!         (when (and (or (looking-at "^#[0-9]*\\s-*\\S-* in \\(\\S-*\\)")
!                        (looking-at "^#[0-9]*\\s-*\\(\\S-*\\)"))
!                    (equal (match-string 1) gdb-current-frame))
            (put-text-property (point-at-bol) (point-at-eol)
                               'face '(:inverse-video t)))
          (forward-line 1))))))
--- 1294,1301 ----
                             '(mouse-face highlight
                               help-echo "mouse-2, RET: Select frame"))
          (beginning-of-line)
!         (when (and (looking-at "^#\\([0-9]+\\)")
!                    (equal (match-string 1) gdb-current-stack-level))
            (put-text-property (point-at-bol) (point-at-eol)
                               'face '(:inverse-video t)))
          (forward-line 1))))))
***************
*** 2047,2052 ****
--- 2049,2056 ----
     (delq 'gdb-get-current-frame gdb-pending-triggers))
    (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
+     (if (looking-at "Stack level \\([0-9]+\\)")
+       (setq gdb-current-stack-level (match-string 1)))
      (forward-line)
      (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ")
        (progn