[Emacs-diffs] Changes to emacs/lisp/progmodes/gud.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gud.el
diff -c emacs/lisp/progmodes/gud.el:1.34 emacs/lisp/progmodes/gud.el:1.35
*** emacs/lisp/progmodes/gud.el:1.34    Wed Apr 20 10:08:21 2005
--- emacs/lisp/progmodes/gud.el Tue May  3 06:47:18 2005
***************
*** 228,233 ****
--- 228,237 ----
        (with-current-buffer buf
        (set (make-local-variable 'gud-minor-mode) minor-mode)
        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+       (when (memq gud-minor-mode '(gdbmi gdba))
+         (make-local-variable 'gdb-define-alist)
+         (unless  gdb-define-alist (gdb-create-define-alist))
+         (add-hook 'after-save-hook 'gdb-create-define-alist nil t))
        (make-local-variable 'gud-keep-buffer))
        buf)))
  
***************
*** 474,480 ****
  
         ;; Extract the frame position from the marker.
         gud-last-frame (cons (match-string 1 gud-marker-acc)
!                           (string-to-int (match-string 2 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
--- 478,484 ----
  
         ;; Extract the frame position from the marker.
         gud-last-frame (cons (match-string 1 gud-marker-acc)
!                           (string-to-number (match-string 2 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
***************
*** 775,788 ****
                        gud-marker-acc start)
          (setq gud-last-frame
                (cons (match-string 3 gud-marker-acc)
!                     (string-to-int (match-string 4 gud-marker-acc)))))
         ;; System V Release 4.0 quite often clumps two lines together
         ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ 
]+ in \\(.+\\)\n\\([0-9]+\\):"
                        gud-marker-acc start)
          (setq gud-sdb-lastfile (match-string 2 gud-marker-acc))
          (setq gud-last-frame
                (cons gud-sdb-lastfile
!                     (string-to-int (match-string 3 gud-marker-acc)))))
         ;; System V Release 4.0
         ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ 
]+ in \\(.+\\)\n"
                        gud-marker-acc start)
--- 779,792 ----
                        gud-marker-acc start)
          (setq gud-last-frame
                (cons (match-string 3 gud-marker-acc)
!                     (string-to-number (match-string 4 gud-marker-acc)))))
         ;; System V Release 4.0 quite often clumps two lines together
         ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ 
]+ in \\(.+\\)\n\\([0-9]+\\):"
                        gud-marker-acc start)
          (setq gud-sdb-lastfile (match-string 2 gud-marker-acc))
          (setq gud-last-frame
                (cons gud-sdb-lastfile
!                     (string-to-number (match-string 3 gud-marker-acc)))))
         ;; System V Release 4.0
         ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ 
]+ in \\(.+\\)\n"
                        gud-marker-acc start)
***************
*** 791,797 ****
                                              gud-marker-acc start))
               (setq gud-last-frame
                     (cons gud-sdb-lastfile
!                          (string-to-int (match-string 1 gud-marker-acc)))))
         (t
          (setq gud-sdb-lastfile nil)))
        (setq start (match-end 0)))
--- 795,801 ----
                                              gud-marker-acc start))
               (setq gud-last-frame
                     (cons gud-sdb-lastfile
!                          (string-to-number (match-string 1 gud-marker-acc)))))
         (t
          (setq gud-sdb-lastfile nil)))
        (setq start (match-end 0)))
***************
*** 877,883 ****
                gud-marker-acc start))
        (setq gud-last-frame
            (cons (match-string 2 gud-marker-acc)
!                 (string-to-int (match-string 1 gud-marker-acc)))
            start (match-end 0)))
  
      ;; Search for the last incomplete line in this chunk
--- 881,887 ----
                gud-marker-acc start))
        (setq gud-last-frame
            (cons (match-string 2 gud-marker-acc)
!                 (string-to-number (match-string 1 gud-marker-acc)))
            start (match-end 0)))
  
      ;; Search for the last incomplete line in this chunk
***************
*** 924,930 ****
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 1 gud-marker-acc)
!            (string-to-int (match-string 2 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
--- 928,934 ----
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 1 gud-marker-acc)
!            (string-to-number (match-string 2 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
***************
*** 1032,1038 ****
            (if (file-exists-p file)
                (setq gud-last-frame
                      (cons (match-string 1 result)
!                           (string-to-int (match-string 2 result))))))
          result)
         ((string-match                 ; kluged-up marker as above
           "\032\032\\([0-9]*\\):\\(.*\\)\n" result)
--- 1036,1042 ----
            (if (file-exists-p file)
                (setq gud-last-frame
                      (cons (match-string 1 result)
!                           (string-to-number (match-string 2 result))))))
          result)
         ((string-match                 ; kluged-up marker as above
           "\032\032\\([0-9]*\\):\\(.*\\)\n" result)
***************
*** 1040,1046 ****
            (if (and file (file-exists-p file))
                (setq gud-last-frame
                      (cons file
!                           (string-to-int (match-string 1 result))))))
          (setq result (substring result 0 (match-beginning 0))))))
      (or result "")))
  
--- 1044,1050 ----
            (if (and file (file-exists-p file))
                (setq gud-last-frame
                      (cons file
!                           (string-to-number (match-string 1 result))))))
          (setq result (substring result 0 (match-beginning 0))))))
      (or result "")))
  
***************
*** 1077,1083 ****
      (while (string-match re gud-marker-acc start)
        (setq gud-last-frame
            (cons (match-string 4 gud-marker-acc)
!                 (string-to-int (match-string 3 gud-marker-acc)))
            start (match-end 0)))
  
      ;; Search for the last incomplete line in this chunk
--- 1081,1087 ----
      (while (string-match re gud-marker-acc start)
        (setq gud-last-frame
            (cons (match-string 4 gud-marker-acc)
!                 (string-to-number (match-string 3 gud-marker-acc)))
            start (match-end 0)))
  
      ;; Search for the last incomplete line in this chunk
***************
*** 1196,1202 ****
                              result)
                  (string-match "[^: \t]+:[ \t]+\\([^:]+\\): [^:]+: 
\\([0-9]+\\):"
                                result))
!             (let ((line (string-to-int (match-string 2 result)))
                    (file (gud-file-name (match-string 1 result))))
                (if file
                    (setq gud-last-frame (cons file line))))))
--- 1200,1206 ----
                              result)
                  (string-match "[^: \t]+:[ \t]+\\([^:]+\\): [^:]+: 
\\([0-9]+\\):"
                                result))
!             (let ((line (string-to-number (match-string 2 result)))
                    (file (gud-file-name (match-string 1 result))))
                (if file
                    (setq gud-last-frame (cons file line))))))
***************
*** 1298,1304 ****
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 1 gud-marker-acc)
!            (string-to-int (match-string 3 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
--- 1302,1308 ----
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 1 gud-marker-acc)
!            (string-to-number (match-string 3 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
***************
*** 1396,1402 ****
         gud-last-frame
         (let ((file (match-string gud-pdb-marker-regexp-file-group
                                 gud-marker-acc))
!            (line (string-to-int
                    (match-string gud-pdb-marker-regexp-line-group
                                  gud-marker-acc))))
         (if (string-equal file "<string>")
--- 1400,1406 ----
         gud-last-frame
         (let ((file (match-string gud-pdb-marker-regexp-file-group
                                 gud-marker-acc))
!            (line (string-to-number
                    (match-string gud-pdb-marker-regexp-line-group
                                  gud-marker-acc))))
         (if (string-equal file "<string>")
***************
*** 2028,2034 ****
        ;;     (<file-name> . <line-number>) .
        (if (if (match-beginning 1)
              (let (n)
!               (setq n (string-to-int (substring
                                        gud-marker-acc
                                        (1+ (match-beginning 1))
                                        (- (match-end 1) 2))))
--- 2032,2038 ----
        ;;     (<file-name> . <line-number>) .
        (if (if (match-beginning 1)
              (let (n)
!               (setq n (string-to-number (substring
                                        gud-marker-acc
                                        (1+ (match-beginning 1))
                                        (- (match-end 1) 2))))
***************
*** 2039,2045 ****
                    (gud-jdb-find-source (match-string 2 gud-marker-acc)))
              (setq gud-last-frame
                    (cons file-found
!                         (string-to-int
                           (let
                                 ((numstr (match-string 4 gud-marker-acc)))
                               (if (string-match "[.,]" numstr)
--- 2043,2049 ----
                    (gud-jdb-find-source (match-string 2 gud-marker-acc)))
              (setq gud-last-frame
                    (cons file-found
!                         (string-to-number
                           (let
                                 ((numstr (match-string 4 gud-marker-acc)))
                               (if (string-match "[.,]" numstr)
***************
*** 2187,2193 ****
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 2 gud-marker-acc)
!            (string-to-int (match-string 4 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
--- 2191,2197 ----
         ;; Extract the frame position from the marker.
         gud-last-frame
         (cons (match-string 2 gud-marker-acc)
!            (string-to-number (match-string 4 gud-marker-acc)))
  
         ;; Append any text before the marker to the output we're going
         ;; to return - we don't include the marker in this text.
***************
*** 2977,2982 ****
--- 2981,2987 ----
        (message "gud-find-class: class for file %s not found in 
gud-jdb-class-source-alist!" f)
        nil))))
  
+ 
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;; GDB script mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;