[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.84 emacs/lisp/progmodes/gdb-ui.el:1.85
*** emacs/lisp/progmodes/gdb-ui.el:1.84 Fri Jul 15 14:45:09 2005
--- emacs/lisp/progmodes/gdb-ui.el      Thu Jul 28 02:38:59 2005
***************
*** 524,532 ****
    (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 ()
--- 524,532 ----
    (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 ()
***************
*** 1023,1029 ****
      (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)
--- 1023,1029 ----
      (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)
***************
*** 1043,1051 ****
    (if gdb-flush-pending-output
        nil
      (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
!     ;; Recall the left over gud-marker-acc from last time
      (setq gud-marker-acc (concat gud-marker-acc string))
!     ;; Start accumulating output for the GUD buffer
      (let ((output ""))
        ;;
        ;; Process all the complete markers in this chunk.
--- 1043,1051 ----
    (if gdb-flush-pending-output
        nil
      (if gdb-enable-debug-log (push (cons 'recv string) gdb-debug-log))
!     ;; Recall the left over gud-marker-acc from last time.
      (setq gud-marker-acc (concat gud-marker-acc string))
!     ;; Start accumulating output for the GUD buffer.
      (let ((output ""))
        ;;
        ;; Process all the complete markers in this chunk.
***************
*** 1295,1301 ****
       :weight bold))
    "Face for enabled breakpoint icon in fringe."
    :group 'gud)
! ;; compatibility alias for old name
  (put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
  
  (defface breakpoint-disabled
--- 1295,1301 ----
       :weight bold))
    "Face for enabled breakpoint icon in fringe."
    :group 'gud)
! ;; Compatibility alias for old name.
  (put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
  
  (defface breakpoint-disabled
***************
*** 1306,1318 ****
      (((background light)) :foreground "grey40"))
    "Face for disabled breakpoint icon in fringe."
    :group 'gud)
! ;; compatibility alias for old name
  (put 'breakpoint-disabled-bitmap-face 'face-alias 'breakpoint-disabled)
  
! ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
  (defun gdb-info-breakpoints-custom ()
    (let ((flag) (bptno))
!     ;; remove all breakpoint-icons in source buffers but not assembler buffer
      (dolist (buffer (buffer-list))
        (with-current-buffer buffer
        (if (and (eq gud-minor-mode 'gdba)
--- 1306,1318 ----
      (((background light)) :foreground "grey40"))
    "Face for disabled breakpoint icon in fringe."
    :group 'gud)
! ;; Compatibility alias for old name.
  (put 'breakpoint-disabled-bitmap-face 'face-alias 'breakpoint-disabled)
  
! ;; Put breakpoint icons in relevant margins (even those set in the GUD 
buffer).
  (defun gdb-info-breakpoints-custom ()
    (let ((flag) (bptno))
!     ;; Remove all breakpoint-icons in source buffers but not assembler buffer.
      (dolist (buffer (buffer-list))
        (with-current-buffer buffer
        (if (and (eq gud-minor-mode 'gdba)
***************
*** 1342,1354 ****
                           (setq file (cdr (assoc bptno gdb-location-alist))))
                        (if (and file
                                 (not (string-equal file "File not found")))
!                           (with-current-buffer (find-file-noselect file)
                              (set (make-local-variable 'gud-minor-mode)
                                   'gdba)
                              (set (make-local-variable 'tool-bar-map)
                                   gud-tool-bar-map)
!                             ;; only want one breakpoint icon at each
!                             ;; location
                              (save-excursion
                                (goto-line (string-to-number line))
                                (gdb-put-breakpoint-icon (eq flag ?y) bptno)))
--- 1342,1355 ----
                           (setq file (cdr (assoc bptno gdb-location-alist))))
                        (if (and file
                                 (not (string-equal file "File not found")))
!                           (with-current-buffer
!                               (find-file-noselect file 'nowarn)
                              (set (make-local-variable 'gud-minor-mode)
                                   'gdba)
                              (set (make-local-variable 'tool-bar-map)
                                   gud-tool-bar-map)
!                             ;; Only want one breakpoint icon at each
!                             ;; location.
                              (save-excursion
                                (goto-line (string-to-number line))
                                (gdb-put-breakpoint-icon (eq flag ?y) bptno)))
***************
*** 1388,1398 ****
        (with-selected-window (posn-window posn)
          (save-excursion
            (goto-char (posn-point posn))
!           (if
! ;             (or
!                (posn-object posn)
! ;              (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
! ;                  'breakpoint))
                (gdb-enqueue-input
                 (list
                  (let ((bptno (get-text-property
--- 1389,1395 ----
        (with-selected-window (posn-window posn)
          (save-excursion
            (goto-char (posn-point posn))
!           (if (posn-object posn)
                (gdb-enqueue-input
                 (list
                  (let ((bptno (get-text-property
***************
*** 1980,1986 ****
             'mouse-1
             #'(lambda () (interactive)
                 (let ((gdb-memory-address
!                       ;; let GDB do the arithmetic
                        (concat
                         gdb-memory-address " - "
                         (number-to-string
--- 1977,1983 ----
             'mouse-1
             #'(lambda () (interactive)
                 (let ((gdb-memory-address
!                       ;; Let GDB do the arithmetic.
                        (concat
                         gdb-memory-address " - "
                         (number-to-string