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

[Nick Roberts]

Index: emacs/lisp/gdb-ui.el
diff -c emacs/lisp/gdb-ui.el:1.32 emacs/lisp/gdb-ui.el:1.33
*** emacs/lisp/gdb-ui.el:1.32   Wed May 21 16:12:20 2003
--- emacs/lisp/gdb-ui.el        Fri May 23 18:38:15 2003
***************
*** 174,180 ****
        (gdb-enqueue-input (list "set new-console off\n" 'ignore)))
    (gdb-enqueue-input (list "set height 0\n" 'ignore))
    ;; find source file and compilation directory here
!   (gdb-enqueue-input (list "server list\n" 'ignore))
    (gdb-enqueue-input (list "server info source\n"
                           'gdb-source-info))
    ;;
--- 174,181 ----
        (gdb-enqueue-input (list "set new-console off\n" 'ignore)))
    (gdb-enqueue-input (list "set height 0\n" 'ignore))
    ;; find source file and compilation directory here
!   (gdb-enqueue-input (list "server list\n" 'ignore))          ; C program
!   (gdb-enqueue-input (list "server list MAIN__\n" 'ignore))   ; Fortran 
program
    (gdb-enqueue-input (list "server info source\n"
                           'gdb-source-info))
    ;;
***************
*** 518,527 ****
  ;; any newlines.
  ;;
  
! (defcustom gud-gdba-command-name 
!   (if (eq window-system 'w32)
!       "gdb -annotate=2 -noasync"
!     "gdb -annotate=2")
    "Default command to execute an executable under the GDB-UI debugger."
    :type 'string
    :group 'gud)
--- 519,525 ----
  ;; any newlines.
  ;;
  
! (defcustom gud-gdba-command-name "gdb -annotate=2 -noasync"
    "Default command to execute an executable under the GDB-UI debugger."
    :type 'string
    :group 'gud)
***************
*** 2148,2155 ****
  buffers."
    (goto-char (point-min))
    (when (search-forward "directory is " nil t)
!     (looking-at "\\S-*")
!     (setq gdb-cdir (match-string 0))
      (search-forward "Located in ")
      (looking-at "\\S-*")
      (setq gdb-main-file (match-string 0))
--- 2146,2155 ----
  buffers."
    (goto-char (point-min))
    (when (search-forward "directory is " nil t)
!     (if (looking-at "\\S-*:\\(\\S-*\\)")
!       (setq gdb-cdir (match-string 1))
!       (looking-at "\\S-*")
!       (setq gdb-cdir (match-string 0)))
      (search-forward "Located in ")
      (looking-at "\\S-*")
      (setq gdb-main-file (match-string 0))