[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.49 emacs/lisp/progmodes/gdb-ui.el:1.50
*** emacs/lisp/progmodes/gdb-ui.el:1.49 Wed Feb 16 20:23:16 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sat Feb 19 05:08:49 2005
***************
*** 338,344 ****
                         (match-string 3)
                         nil nil)))
          (push var gdb-var-list)
-         (setq speedbar-update-flag t)
          (speedbar 1)
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
--- 338,343 ----
***************
*** 433,439 ****
                     `(lambda () (gdb-var-evaluate-expression-handler
                                  ,varnum t)))))))
    (setq gdb-pending-triggers
!    (delq 'gdb-var-update gdb-pending-triggers)))
  
  (defun gdb-var-delete ()
    "Delete watched expression from the speedbar."
--- 432,449 ----
                     `(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))
!     ;; dummy command to update speedbar at right time
!     (gdb-enqueue-input (list "server pwd\n" 'gdb-speedbar-timer-fn))
!     ;; keep gdb-pending-triggers non-nil till end
!     (push 'gdb-speedbar-timer gdb-pending-triggers)))
! 
! (defun gdb-speedbar-timer-fn ()
!   (setq gdb-pending-triggers
!       (delq 'gdb-speedbar-timer gdb-pending-triggers))
!   (with-current-buffer gud-comint-buffer
!     (speedbar-timer-fn)))
  
  (defun gdb-var-delete ()
    "Delete watched expression from the speedbar."
***************
*** 882,893 ****
        (gdb-invalidate-threads)
        (unless (eq system-type 'darwin) ;Breaks on Darwin's GDB-5.3.
          ;; FIXME: with GDB-6 on Darwin, this might very well work.
!         (dolist (frame (frame-list))
!           (when (string-equal (frame-parameter frame 'name) "Speedbar")
!             (setq gdb-var-changed t)    ; force update
!             (dolist (var gdb-var-list)
!               (setcar (nthcdr 5 var) nil))))
!         (gdb-var-update))))
    (let ((sink gdb-output-sink))
      (cond
       ((eq sink 'user) t)
--- 892,903 ----
        (gdb-invalidate-threads)
        (unless (eq system-type 'darwin) ;Breaks on Darwin's GDB-5.3.
          ;; FIXME: with GDB-6 on Darwin, this might very well work.
!         ;; only needed/used with speedbar/watch expressions
!         (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
!           (setq gdb-var-changed t)    ; force update
!           (dolist (var gdb-var-list)
!             (setcar (nthcdr 5 var) nil))
!           (gdb-var-update)))))
    (let ((sink gdb-output-sink))
      (cond
       ((eq sink 'user) t)