[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.75 emacs/lisp/progmodes/gdb-ui.el:1.76
*** emacs/lisp/progmodes/gdb-ui.el:1.75 Mon May 30 06:11:01 2005
--- emacs/lisp/progmodes/gdb-ui.el      Tue May 31 20:55:48 2005
***************
*** 277,283 ****
  (defun gdb-set-gud-minor-mode-1 (buffer)
    (goto-char (point-min))
    (when (and (search-forward "Located in " nil t)
!            (looking-at "\\S-*")
             (string-equal (buffer-file-name buffer)
                           (match-string 0)))
      (with-current-buffer buffer
--- 277,283 ----
  (defun gdb-set-gud-minor-mode-1 (buffer)
    (goto-char (point-min))
    (when (and (search-forward "Located in " nil t)
!            (looking-at "\\S-+")
             (string-equal (buffer-file-name buffer)
                           (match-string 0)))
      (with-current-buffer buffer
***************
*** 1161,1172 ****
       (let ((buf (gdb-get-buffer ',buf-key)))
         (and buf
            (with-current-buffer buf
!             (let ((p (point))
                    (buffer-read-only nil))
                (erase-buffer)
                (insert-buffer-substring (gdb-get-create-buffer
                                          'gdb-partial-output-buffer))
!               (goto-char p)))))
       ;; put customisation here
       (,custom-defun)))
  
--- 1161,1172 ----
       (let ((buf (gdb-get-buffer ',buf-key)))
         (and buf
            (with-current-buffer buf
!             (let ((p (window-point (get-buffer-window buf 0)))
                    (buffer-read-only nil))
                (erase-buffer)
                (insert-buffer-substring (gdb-get-create-buffer
                                          'gdb-partial-output-buffer))
!               (set-window-point (get-buffer-window buf 0) p)))))
       ;; put customisation here
       (,custom-defun)))
  
***************
*** 1304,1310 ****
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
          (forward-line 1)
!         (if (looking-at "[^\t].*breakpoint")
              (progn
                (looking-at "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)")
                (setq bptno (match-string 1))
--- 1304,1310 ----
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
          (forward-line 1)
!         (if (looking-at "[^\t].*?breakpoint")
              (progn
                (looking-at "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)")
                (setq bptno (match-string 1))
***************
*** 1463,1471 ****
    (interactive)
    (beginning-of-line 1)
    (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
!         (looking-at "\\([0-9]+\\).*point\\s-*\\S-*\\s-*\\(.\\)")
        (looking-at
!        "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\S-*:[0-9]+"))
        (gdb-enqueue-input
         (list
        (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
--- 1463,1471 ----
    (interactive)
    (beginning-of-line 1)
    (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
!         (looking-at "\\([0-9]+\\).*?point\\s-+\\S-+\\s-+\\(.\\)")
        (looking-at
!        "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\s-+\\S-+\\s-+\\S-+:[0-9]+"))
        (gdb-enqueue-input
         (list
        (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
***************
*** 1478,1487 ****
    (save-excursion
      (beginning-of-line 1)
      (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
!           (looking-at "\\([0-9]+\\) .* in .* at\\s-+\\(\\S-*\\):\\([0-9]+\\)")
          (looking-at
!          "\\([0-9]+\\)\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\
! \\(\\S-*\\):\\([0-9]+\\)"))
        (let ((bptno (match-string 1))
              (file  (match-string 2))
              (line  (match-string 3)))
--- 1478,1487 ----
    (save-excursion
      (beginning-of-line 1)
      (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
!           (looking-at "\\([0-9]+\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)")
          (looking-at
!          "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+.\\s-+\\S-+\\s-+\
! \\(\\S-+\\):\\([0-9]+\\)"))
        (let ((bptno (match-string 1))
              (file  (match-string 2))
              (line  (match-string 3)))
***************
*** 2301,2307 ****
  buffers."
    (goto-char (point-min))
    (if (and (search-forward "Located in " nil t)
!          (looking-at "\\S-*"))
        (setq gdb-main-file (match-string 0)))
    (goto-char (point-min))
    (if (search-forward "Includes preprocessor macro info." nil t)
--- 2301,2307 ----
  buffers."
    (goto-char (point-min))
    (if (and (search-forward "Located in " nil t)
!          (looking-at "\\S-+"))
        (setq gdb-main-file (match-string 0)))
    (goto-char (point-min))
    (if (search-forward "Includes preprocessor macro info." nil t)
***************
*** 2319,2325 ****
    (goto-char (point-min))
    (catch 'file-not-found
      (if (search-forward "Located in " nil t)
!       (when (looking-at "\\S-*")
          (delete (cons bptno "File not found") gdb-location-alist)
          (push (cons bptno (match-string 0)) gdb-location-alist))
        (gdb-resync)
--- 2319,2325 ----
    (goto-char (point-min))
    (catch 'file-not-found
      (if (search-forward "Located in " nil t)
!       (when (looking-at "\\S-+")
          (delete (cons bptno "File not found") gdb-location-alist)
          (push (cons bptno (match-string 0)) gdb-location-alist))
        (gdb-resync)
***************
*** 2493,2499 ****
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
        (forward-line 1)
!       (if (looking-at "[^\t].*breakpoint")
            (progn
              (looking-at
            "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)")
--- 2493,2499 ----
        (goto-char (point-min))
        (while (< (point) (- (point-max) 1))
        (forward-line 1)
!       (if (looking-at "[^\t].*?breakpoint")
            (progn
              (looking-at
            "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x0*\\(\\S-+\\)")