[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.72 emacs/lisp/progmodes/gdb-ui.el:1.73
*** emacs/lisp/progmodes/gdb-ui.el:1.72 Fri May 27 20:56:43 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sat May 28 12:15:33 2005
***************
*** 2439,2458 ****
    (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
        (pos 1) (address) (flag) (bptno))
      (with-current-buffer buffer
!       (if (not (equal gdb-frame-address "main"))
!         (progn
!           (goto-char (point-min))
!           (if (and gdb-frame-address
!                    (re-search-forward gdb-frame-address nil t))
!               (progn
!                 (setq pos (point))
!                 (beginning-of-line)
!                 (or gdb-overlay-arrow-position
!                     (setq gdb-overlay-arrow-position (make-marker)))
!                 (set-marker gdb-overlay-arrow-position
!                             (point) (current-buffer))))))
!       ;; remove all breakpoint-icons in assembler buffer before updating.
!       (gdb-remove-breakpoint-icons (point-min) (point-max)))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
--- 2439,2459 ----
    (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
        (pos 1) (address) (flag) (bptno))
      (with-current-buffer buffer
!       (save-excursion
!       (if (not (equal gdb-frame-address "main"))
!           (progn
!             (goto-char (point-min))
!             (if (and gdb-frame-address
!                      (re-search-forward gdb-frame-address nil t))
!                 (progn
!                   (setq pos (point))
!                   (beginning-of-line)
!                   (or gdb-overlay-arrow-position
!                       (setq gdb-overlay-arrow-position (make-marker)))
!                   (set-marker gdb-overlay-arrow-position
!                               (point) (current-buffer))))))
!       ;; remove all breakpoint-icons in assembler buffer before updating.
!       (gdb-remove-breakpoint-icons (point-min) (point-max))))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
***************
*** 2465,2473 ****
              (setq flag (char-after (match-beginning 2)))
              (setq address (match-string 3))
              (with-current-buffer buffer
                  (goto-char (point-min))
                  (if (re-search-forward address nil t)
!                     (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))
      (if (not (equal gdb-frame-address "main"))
        (set-window-point (get-buffer-window buffer 0) pos))))
  
--- 2466,2475 ----
              (setq flag (char-after (match-beginning 2)))
              (setq address (match-string 3))
              (with-current-buffer buffer
+               (save-excursion
                  (goto-char (point-min))
                  (if (re-search-forward address nil t)
!                     (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
      (if (not (equal gdb-frame-address "main"))
        (set-window-point (get-buffer-window buffer 0) pos))))