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

[Juanma Barranquero]

Index: emacs/lisp/gud.el
diff -c emacs/lisp/gud.el:1.173 emacs/lisp/gud.el:1.174
*** emacs/lisp/gud.el:1.173     Mon Jan 20 17:03:50 2003
--- emacs/lisp/gud.el   Tue Feb  4 06:22:06 2003
***************
*** 1934,1940 ****
              (setq gud-last-frame
                    (cons file-found
                          (string-to-int
!                          (let 
                                 ((numstr (match-string 4 gud-marker-acc)))
                               (if (string-match "," numstr)
                                   (replace-match "" nil nil numstr)
--- 1934,1940 ----
              (setq gud-last-frame
                    (cons file-found
                          (string-to-int
!                          (let
                                 ((numstr (match-string 4 gud-marker-acc)))
                               (if (string-match "," numstr)
                                   (replace-match "" nil nil numstr)
***************
*** 2519,2525 ****
            (if (not (or (verify-visited-file-modtime buffer) gud-keep-buffer))
                (progn
                  (if
!                     (yes-or-no-p 
                       (format "File %s changed on disk.  Reread from disk? "
                               (buffer-name)))
                      (revert-buffer t t)
--- 2519,2525 ----
            (if (not (or (verify-visited-file-modtime buffer) gud-keep-buffer))
                (progn
                  (if
!                     (yes-or-no-p
                       (format "File %s changed on disk.  Reread from disk? "
                               (buffer-name)))
                      (revert-buffer t t)
***************
*** 2576,2583 ****
         ((eq key ?a)
          (setq subst (gud-read-address)))
         ((eq key ?c)
!         (setq subst 
!                 (gud-find-class 
                   (if insource
                        (buffer-file-name)
                      (car frame))
--- 2576,2583 ----
         ((eq key ?a)
          (setq subst (gud-read-address)))
         ((eq key ?c)
!         (setq subst
!                 (gud-find-class
                   (if insource
                        (buffer-file-name)
                      (car frame))
***************
*** 2830,2841 ****
                    ;; While the c-syntactic information does not start
                    ;; with the 'topmost-intro symbol, there may be
                    ;; nested classes...
!                   (while (not (eq 'topmost-intro 
                                    (car (car (c-guess-basic-syntax)))))
                      ;; Check if the current position c-syntactic
                      ;; analysis has 'inclass
                      (setq syntax (c-guess-basic-syntax))
!                     (while 
                          (and (not (eq 'inclass (car (car syntax))))
                               (cdr syntax))
                        (setq syntax (cdr syntax)))
--- 2830,2841 ----
                    ;; While the c-syntactic information does not start
                    ;; with the 'topmost-intro symbol, there may be
                    ;; nested classes...
!                   (while (not (eq 'topmost-intro
                                    (car (car (c-guess-basic-syntax)))))
                      ;; Check if the current position c-syntactic
                      ;; analysis has 'inclass
                      (setq syntax (c-guess-basic-syntax))
!                     (while
                          (and (not (eq 'inclass (car (car syntax))))
                               (cdr syntax))
                        (setq syntax (cdr syntax)))
***************
*** 2855,2861 ****
                        (goto-char (cdr (car syntax)))
                        ))
                    (string-match (concat (car nclass) "$") class-found)
!                   (setq class-found 
                          (replace-match (mapconcat 'identity nclass "$")
                                         t t class-found)))))
            (if (not class-found)
--- 2855,2861 ----
                        (goto-char (cdr (car syntax)))
                        ))
                    (string-match (concat (car nclass) "$") class-found)
!                   (setq class-found
                          (replace-match (mapconcat 'identity nclass "$")
                                         t t class-found)))))
            (if (not class-found)