[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.108 
emacs/lisp/progmodes/gdb-ui.el:1.109
*** emacs/lisp/progmodes/gdb-ui.el:1.108        Fri Nov  4 02:02:29 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun Nov  6 01:31:24 2005
***************
*** 241,247 ****
    :group 'gud
    :version "22.1")
  
- 
  (defcustom gdb-use-inferior-io-buffer nil
    "Non-nil means display output from the inferior in a separate buffer."
    :type 'boolean
--- 241,246 ----
***************
*** 495,502 ****
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
               (list
!               (if (with-current-buffer
!                       gud-comint-buffer (eq gud-minor-mode 'gdba))
                    (concat "server interpreter mi \"-var-evaluate-expression "
                            (nth 1 var) "\"\n")
                  (concat "-var-evaluate-expression " (nth 1 var) "\n"))
--- 494,501 ----
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
               (list
!               (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
!                       'gdba)
                    (concat "server interpreter mi \"-var-evaluate-expression "
                            (nth 1 var) "\"\n")
                  (concat "-var-evaluate-expression " (nth 1 var) "\n"))
***************
*** 598,605 ****
  (defun gdb-var-delete ()
    "Delete watch expression at point from the speedbar."
    (interactive)
!   (if (with-current-buffer
!         gud-comint-buffer (memq gud-minor-mode '(gdbmi gdba)))
        (let ((text (speedbar-line-text)))
        (string-match "\\(\\S-+\\)" text)
        (let* ((expr (match-string 1 text))
--- 597,604 ----
  (defun gdb-var-delete ()
    "Delete watch expression at point from the speedbar."
    (interactive)
!   (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
!           '(gdbmi gdba))
        (let ((text (speedbar-line-text)))
        (string-match "\\(\\S-+\\)" text)
        (let* ((expr (match-string 1 text))
***************
*** 608,615 ****
          (unless (string-match "\\." varnum)
            (gdb-enqueue-input
             (list
!             (if (with-current-buffer gud-comint-buffer
!                   (eq gud-minor-mode 'gdba))
                  (concat "server interpreter mi \"-var-delete " varnum "\"\n")
                (concat "-var-delete " varnum "\n"))
                   'ignore))
--- 607,614 ----
          (unless (string-match "\\." varnum)
            (gdb-enqueue-input
             (list
!             (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
!                     'gdba)
                  (concat "server interpreter mi \"-var-delete " varnum "\"\n")
                (concat "-var-delete " varnum "\n"))
                   'ignore))
***************
*** 626,633 ****
      (setq value (read-string "New value: "))
      (gdb-enqueue-input
       (list
!       (if (with-current-buffer gud-comint-buffer
!           (eq gud-minor-mode 'gdba))
          (concat "server interpreter mi \"-var-assign "
                  varnum " " value "\"\n")
        (concat "-var-assign " varnum " " value "\n"))
--- 625,631 ----
      (setq value (read-string "New value: "))
      (gdb-enqueue-input
       (list
!       (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
          (concat "server interpreter mi \"-var-assign "
                  varnum " " value "\"\n")
        (concat "-var-assign " varnum " " value "\n"))
***************
*** 646,652 ****
  TOKEN is data related to this node.
  INDENT is the current indentation depth."
    (cond ((string-match "+" text)        ;expand this node
!        (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
             (gdb-var-list-children token)
           (progn
             (gdbmi-var-update)
--- 644,650 ----
  TOKEN is data related to this node.
  INDENT is the current indentation depth."
    (cond ((string-match "+" text)        ;expand this node
!        (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
             (gdb-var-list-children token)
           (progn
             (gdbmi-var-update)
***************
*** 697,703 ****
                (setq trigger (funcall (car (cdr (cdr rules))))))
            (setq gdb-buffer-type key)
            (set (make-local-variable 'gud-minor-mode)
!                (with-current-buffer gud-comint-buffer gud-minor-mode))
            (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
            (if trigger (funcall trigger)))
          new))))
--- 695,701 ----
                (setq trigger (funcall (car (cdr (cdr rules))))))
            (setq gdb-buffer-type key)
            (set (make-local-variable 'gud-minor-mode)
!                (buffer-local-value 'gud-minor-mode gud-comint-buffer))
            (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
            (if trigger (funcall trigger)))
          new))))
***************
*** 884,905 ****
    (setq gdb-flush-pending-output nil)
    (if gdb-enable-debug-log (push (cons 'send-item item) gdb-debug-log))
    (setq gdb-current-item item)
!   (with-current-buffer gud-comint-buffer
!     (if (eq gud-minor-mode 'gdba)
        (if (stringp item)
            (progn
              (setq gdb-output-sink 'user)
!             (process-send-string (get-buffer-process gud-comint-buffer) item))
          (progn
            (gdb-clear-partial-output)
            (setq gdb-output-sink 'pre-emacs)
!           (process-send-string (get-buffer-process gud-comint-buffer)
                                 (car item))))
        ;; case: eq gud-minor-mode 'gdbmi
        (gdb-clear-partial-output)
        (setq gdb-output-sink 'emacs)
!       (process-send-string (get-buffer-process gud-comint-buffer)
!                          (car item)))))
  
  ;;
  ;; output -- things gdb prints to emacs
--- 882,902 ----
    (setq gdb-flush-pending-output nil)
    (if gdb-enable-debug-log (push (cons 'send-item item) gdb-debug-log))
    (setq gdb-current-item item)
!   (let ((process (get-buffer-process gud-comint-buffer)))
!     (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        (if (stringp item)
            (progn
              (setq gdb-output-sink 'user)
!             (process-send-string process item))
          (progn
            (gdb-clear-partial-output)
            (setq gdb-output-sink 'pre-emacs)
!           (process-send-string process
                                 (car item))))
        ;; case: eq gud-minor-mode 'gdbmi
        (gdb-clear-partial-output)
        (setq gdb-output-sink 'emacs)
!       (process-send-string process (car item)))))
  
  ;;
  ;; output -- things gdb prints to emacs
***************
*** 1545,1551 ****
    (use-local-map gdb-breakpoints-mode-map)
    (setq buffer-read-only t)
    (run-mode-hooks 'gdb-breakpoints-mode-hook)
!   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-breakpoints
      'gdbmi-invalidate-breakpoints))
  
--- 1542,1548 ----
    (use-local-map gdb-breakpoints-mode-map)
    (setq buffer-read-only t)
    (run-mode-hooks 'gdb-breakpoints-mode-hook)
!   (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        'gdb-invalidate-breakpoints
      'gdbmi-invalidate-breakpoints))
  
***************
*** 1554,1560 ****
    (interactive)
    (save-excursion
      (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-+\\(.\\)\\s-+")
          (looking-at
       
"\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+\\S-+\\s-+\\S-+:[0-9]+"))
--- 1551,1557 ----
    (interactive)
    (save-excursion
      (beginning-of-line 1)
!     (if (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
            (looking-at "\\([0-9]+\\).*?point\\s-+\\S-+\\s-+\\(.\\)\\s-+")
          (looking-at
       
"\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+\\S-+\\s-+\\S-+:[0-9]+"))
***************
*** 1571,1577 ****
    "Delete the breakpoint at current line."
    (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]+"))
--- 1568,1574 ----
    "Delete the breakpoint at current line."
    (interactive)
    (beginning-of-line 1)
!   (if (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
          (looking-at "\\([0-9]+\\).*?point\\s-+\\S-+\\s-+\\(.\\)")
        (looking-at
         "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\s-+\\S-+\\s-+\\S-+:[0-9]+"))
***************
*** 1589,1595 ****
      (if window (save-selected-window  (select-window window))))
    (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-+\
--- 1586,1592 ----
      (if window (save-selected-window  (select-window window))))
    (save-excursion
      (beginning-of-line 1)
!     (if (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
            (looking-at "\\([0-9]+\\) .+ in .+ at\\s-+\\(\\S-+\\):\\([0-9]+\\)")
          (looking-at
           "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+.\\s-+\\S-+\\s-+\
***************
*** 1694,1700 ****
    (use-local-map gdb-frames-mode-map)
    (font-lock-mode -1)
    (run-mode-hooks 'gdb-frames-mode-hook)
!   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-frames
      'gdbmi-invalidate-frames))
  
--- 1691,1697 ----
    (use-local-map gdb-frames-mode-map)
    (font-lock-mode -1)
    (run-mode-hooks 'gdb-frames-mode-hook)
!   (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        'gdb-invalidate-frames
      'gdbmi-invalidate-frames))
  
***************
*** 1849,1855 ****
    (setq buffer-read-only t)
    (use-local-map gdb-registers-mode-map)
    (run-mode-hooks 'gdb-registers-mode-hook)
!   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-registers
      'gdbmi-invalidate-registers))
  
--- 1846,1852 ----
    (setq buffer-read-only t)
    (use-local-map gdb-registers-mode-map)
    (run-mode-hooks 'gdb-registers-mode-hook)
!   (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        'gdb-invalidate-registers
      'gdbmi-invalidate-registers))
  
***************
*** 2266,2272 ****
    (set (make-local-variable 'font-lock-defaults)
         '(gdb-locals-font-lock-keywords))
    (run-mode-hooks 'gdb-locals-mode-hook)
!   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
        'gdb-invalidate-locals
      'gdbmi-invalidate-locals))
  
--- 2263,2269 ----
    (set (make-local-variable 'font-lock-defaults)
         '(gdb-locals-font-lock-keywords))
    (run-mode-hooks 'gdb-locals-mode-hook)
!   (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
        'gdb-invalidate-locals
      'gdbmi-invalidate-locals))
  
***************
*** 2528,2535 ****
           ;; in case gud or gdb-ui is just loaded
           gud-comint-buffer
           (buffer-name gud-comint-buffer)
!          (with-current-buffer gud-comint-buffer
!            (eq gud-minor-mode 'gdba)))
        (condition-case nil
        (gdb-enqueue-input
         (list (concat gdb-server-prefix "list "
--- 2525,2532 ----
           ;; in case gud or gdb-ui is just loaded
           gud-comint-buffer
           (buffer-name gud-comint-buffer)
!          (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
!              'gdba))
        (condition-case nil
        (gdb-enqueue-input
         (list (concat gdb-server-prefix "list "