[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.40 emacs/lisp/progmodes/gdb-ui.el:1.41
*** emacs/lisp/progmodes/gdb-ui.el:1.40 Fri Jan 28 21:48:48 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sat Jan 29 06:55:14 2005
***************
*** 1902,1908 ****
  
  (defun gdb-assembler-custom ()
    (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
!       (pos 1) (address) (flag))
      (with-current-buffer buffer
        (if (not (equal gdb-current-address "main"))
          (progn
--- 1902,1908 ----
  
  (defun gdb-assembler-custom ()
    (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
!       (pos 1) (address) (flag) (bptno))
      (with-current-buffer buffer
        (if (not (equal gdb-current-address "main"))
          (progn
***************
*** 1924,1939 ****
        (if (looking-at "[^\t].*breakpoint")
            (progn
              (looking-at
!              "[0-9]*\\s-*\\S-*\\s-*\\S-*\\s-*\\(.\\)\\s-*0x\\(\\S-*\\)")
!             (setq flag (char-after (match-beginning 1)))
!             (setq address (match-string 2))
              ;; remove leading 0s from output of info break.
              (if (string-match "^0+\\(.*\\)" address)
                  (setq address (match-string 1 address)))
              (with-current-buffer buffer
                  (goto-char (point-min))
                  (if (re-search-forward address nil t)
!                     (gdb-put-breakpoint-icon (eq flag ?y))))))))
      (if (not (equal gdb-current-address "main"))
        (set-window-point (get-buffer-window buffer 0) pos))))
  
--- 1924,1940 ----
        (if (looking-at "[^\t].*breakpoint")
            (progn
              (looking-at
!              "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x\\(\\S-+\\)")
!             (setq bptno (match-string 1))
!             (setq flag (char-after (match-beginning 2)))
!             (setq address (match-string 3))
              ;; remove leading 0s from output of info break.
              (if (string-match "^0+\\(.*\\)" address)
                  (setq address (match-string 1 address)))
              (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-current-address "main"))
        (set-window-point (get-buffer-window buffer 0) pos))))