[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.110 
emacs/lisp/progmodes/gdb-ui.el:1.111
*** emacs/lisp/progmodes/gdb-ui.el:1.110        Sat Nov 12 21:18:10 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun Nov 13 09:02:23 2005
***************
*** 493,499 ****
            (speedbar-change-initial-expansion-list "GUD"))
          (if (or (equal (nth 2 var) "0")
                  (and (equal (nth 2 var) "1")
!                      (equal (nth 3 var) "char *")))
              (gdb-enqueue-input
               (list
                (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
--- 493,499 ----
            (speedbar-change-initial-expansion-list "GUD"))
          (if (or (equal (nth 2 var) "0")
                  (and (equal (nth 2 var) "1")
!                      (string-match "char \\*" (nth 3 var))))
              (gdb-enqueue-input
               (list
                (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
***************
*** 511,517 ****
  (defun gdb-var-evaluate-expression-handler (varnum changed)
    (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
!     (re-search-forward ".*value=\\(\".+\"\\)" nil t)
      (catch 'var-found
        (let ((num 0))
        (dolist (var gdb-var-list)
--- 511,517 ----
  (defun gdb-var-evaluate-expression-handler (varnum changed)
    (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
!     (re-search-forward ".*value=\\(\".*\"\\)" nil t)
      (catch 'var-found
        (let ((num 0))
        (dolist (var gdb-var-list)
***************
*** 554,560 ****
                   (push varchild var-list)
                   (if (or (equal (nth 2 varchild) "0")
                           (and (equal (nth 2 varchild) "1")
!                               (equal (nth 3 varchild) "char *")))
                       (gdb-enqueue-input
                        (list
                         (concat
--- 554,560 ----
                   (push varchild var-list)
                   (if (or (equal (nth 2 varchild) "0")
                           (and (equal (nth 2 varchild) "1")
!                               (string-match "char \\*" (nth 3 varchild))))
                       (gdb-enqueue-input
                        (list
                         (concat
***************
*** 578,589 ****
    (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
      (while (re-search-forward gdb-var-update-regexp nil t)
        (let ((varnum (match-string 1)))
!         (gdb-enqueue-input
!          (list
!           (concat "server interpreter mi \"-var-evaluate-expression "
!                   varnum "\"\n")
!           `(lambda () (gdb-var-evaluate-expression-handler ,varnum t)))))))
    (setq gdb-pending-triggers
     (delq 'gdb-var-update gdb-pending-triggers))
    (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
--- 578,596 ----
    (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
      (goto-char (point-min))
      (while (re-search-forward gdb-var-update-regexp nil t)
+       (catch 'var-found-1
        (let ((varnum (match-string 1)))
!         (dolist (var gdb-var-list)
!           (when (and (string-equal varnum (cadr var))
!                    (or (equal (nth 2 var) "0")
!                        (and (equal (nth 2 var) "1")
!                             (string-match "char \\*" (nth 3 var)))))
!             (gdb-enqueue-input
!              (list
!               (concat "server interpreter mi \"-var-evaluate-expression "
!                       varnum "\"\n")
!               `(lambda () (gdb-var-evaluate-expression-handler ,varnum t))))
!             (throw 'var-found-1 nil)))))))
    (setq gdb-pending-triggers
     (delq 'gdb-var-update gdb-pending-triggers))
    (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))