[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.83 emacs/lisp/progmodes/gdb-ui.el:1.84
*** emacs/lisp/progmodes/gdb-ui.el:1.83 Tue Jul 12 05:31:08 2005
--- emacs/lisp/progmodes/gdb-ui.el      Fri Jul 15 14:45:09 2005
***************
*** 503,517 ****
         (setq gdb-var-list (nreverse var-list))))))
  
  (defun gdb-var-update ()
!   (if (not (member 'gdb-var-update gdb-pending-triggers))
!       (progn
!       (gdb-enqueue-input
!        (list
!         (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
!             "server interpreter mi \"-var-update *\"\n"
!           "-var-update *\n")
!                                'gdb-var-update-handler))
!       (push 'gdb-var-update gdb-pending-triggers))))
  
  (defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
  
--- 503,513 ----
         (setq gdb-var-list (nreverse var-list))))))
  
  (defun gdb-var-update ()
!   (when (not (member 'gdb-var-update gdb-pending-triggers))
!     (gdb-enqueue-input
!      (list "server interpreter mi \"-var-update *\"\n"
!          'gdb-var-update-handler))
!     (push 'gdb-var-update gdb-pending-triggers)))
  
  (defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
  
***************
*** 522,534 ****
        (let ((varnum (match-string 1)))
          (gdb-enqueue-input
           (list
!           (if (with-current-buffer gud-comint-buffer
!                 (eq gud-minor-mode 'gdba))
!               (concat "server interpreter mi \"-var-evaluate-expression "
!                       varnum "\"\n")
!             (concat "-var-evaluate-expression " varnum "\n"))
!                    `(lambda () (gdb-var-evaluate-expression-handler
!                                 ,varnum t)))))))
    (setq gdb-pending-triggers
     (delq 'gdb-var-update gdb-pending-triggers))
    (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
--- 518,526 ----
        (let ((varnum (match-string 1)))
          (gdb-enqueue-input
           (list
!           (concat "server interpreter mi \"-var-evaluate-expression "
!                   varnum "\"\n")
!           `(lambda () (gdb-var-evaluate-expression-handler ,varnum t)))))))
    (setq gdb-pending-triggers
     (delq 'gdb-var-update gdb-pending-triggers))
    (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
***************
*** 544,552 ****
      (speedbar-timer-fn)))
  
  (defun gdb-var-delete ()
!   "Delete watched expression from the speedbar."
    (interactive)
!   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        (let ((text (speedbar-line-text)))
        (string-match "\\(\\S-+\\)" text)
        (let* ((expr (match-string 1 text))
--- 536,545 ----
      (speedbar-timer-fn)))
  
  (defun gdb-var-delete ()
!   "Delete watch expression at point from the speedbar."
    (interactive)
!   (if (with-current-buffer
!         gud-comint-buffer (memq gud-minor-mode '(gdbmi gdba)))
        (let ((text (speedbar-line-text)))
        (string-match "\\(\\S-+\\)" text)
        (let* ((expr (match-string 1 text))
***************
*** 595,601 ****
    (cond ((string-match "+" text)        ;expand this node
         (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
             (gdb-var-list-children token)
!          (gdbmi-var-list-children token)))
        ((string-match "-" text)        ;contract this node
         (dolist (var gdb-var-list)
           (if (string-match (concat token "\\.") (nth 1 var))
--- 588,596 ----
    (cond ((string-match "+" text)        ;expand this node
         (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
             (gdb-var-list-children token)
!          (progn
!            (gdbmi-var-update)
!            (gdbmi-var-list-children token))))
        ((string-match "-" text)        ;contract this node
         (dolist (var gdb-var-list)
           (if (string-match (concat token "\\.") (nth 1 var))