[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.51 emacs/lisp/progmodes/gdb-ui.el:1.52
*** emacs/lisp/progmodes/gdb-ui.el:1.51 Tue Mar  1 10:43:05 2005
--- emacs/lisp/progmodes/gdb-ui.el      Mon Mar  7 01:55:18 2005
***************
*** 341,348 ****
          (speedbar 1)
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
!              (list (concat "server interpreter mi \"-var-evaluate-expression "
!                            (nth 1 var) "\"\n")
                     `(lambda () (gdb-var-evaluate-expression-handler
                                  ,(nth 1 var) nil))))
            (setq gdb-var-changed t)))
--- 341,352 ----
          (speedbar 1)
          (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"))
                     `(lambda () (gdb-var-evaluate-expression-handler
                                  ,(nth 1 var) nil))))
            (setq gdb-var-changed t)))
***************
*** 368,375 ****
  
  (defun gdb-var-list-children (varnum)
    (gdb-enqueue-input
!    (list (concat "server interpreter mi \"-var-list-children "  varnum "\"\n")
!            `(lambda () (gdb-var-list-children-handler ,varnum)))))
  
  (defconst gdb-var-list-children-regexp
    "name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\"")
--- 372,379 ----
  
  (defun gdb-var-list-children (varnum)
    (gdb-enqueue-input
!    (list (concat "server interpreter mi \"-var-list-children " varnum "\"\n")
!        `(lambda () (gdb-var-list-children-handler ,varnum)))))
  
  (defconst gdb-var-list-children-regexp
    "name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\"")
***************
*** 674,682 ****
  (defun gdb-send (proc string)
    "A comint send filter for gdb.
  This filter may simply queue input for a later time."
!   (if gud-running
!       (process-send-string proc (concat string "\n"))
!     (gdb-enqueue-input (concat string "\n"))))
  
  ;; Note: Stuff enqueued here will be sent to the next prompt, even if it
  ;; is a query, or other non-top-level prompt.
--- 678,689 ----
  (defun gdb-send (proc string)
    "A comint send filter for gdb.
  This filter may simply queue input for a later time."
!   (let ((item (concat string "\n")))
!     (if gud-running
!       (progn
!       (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
!       (process-send-string proc item))
!       (gdb-enqueue-input item))))
  
  ;; Note: Stuff enqueued here will be sent to the next prompt, even if it
  ;; is a query, or other non-top-level prompt.
***************
*** 697,703 ****
  
  (defun gdb-send-item (item)
    (setq gdb-flush-pending-output nil)
!   (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
    (setq gdb-current-item item)
    (with-current-buffer gud-comint-buffer
      (if (eq gud-minor-mode 'gdba)
--- 704,710 ----
  
  (defun gdb-send-item (item)
    (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)