[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.115 
emacs/lisp/progmodes/gdb-ui.el:1.116
*** emacs/lisp/progmodes/gdb-ui.el:1.115        Tue Nov 22 03:35:33 2005
--- emacs/lisp/progmodes/gdb-ui.el      Thu Nov 24 00:34:59 2005
***************
*** 67,72 ****
--- 67,75 ----
  ;; and compiling with -DUNBUFFERED while debugging.
  ;;
  ;; Known Bugs:
+ ;; 1) Strings that are watched don't update in the speedbar when their
+ ;; contents change.
+ ;; 2) Watch expressions go out of scope when the inferior is re-run.
  ;;
  ;; TODO:
  ;; 1) Use MI command -data-read-memory for memory window.
***************
*** 471,476 ****
--- 474,494 ----
                  (forward-char 2)
                  (gud-call (concat "until *%a")))))))))
  
+ (defcustom gdb-speedbar-auto-raise t
+   "If non-nil raise speedbar every time display of watch expressions is\
+  updated."
+   :type 'boolean
+   :group 'gud
+   :version "22.1")
+ 
+ (defun gdb-speedbar-auto-raise (arg)
+   "Toggle automatic raising of the speedbar for watch expressions."
+   (interactive "P")
+   (setq gdb-speedbar-auto-raise
+       (if (null arg)
+           (not gdb-speedbar-auto-raise)
+         (> (prefix-numeric-value arg) 0))))
+ 
  (defcustom gdb-use-colon-colon-notation nil
    "If non-nil use FUN::VAR format to display variables in the speedbar."
    :type 'boolean
***************
*** 516,522 ****
            (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)
--- 534,540 ----
            (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)
***************
*** 577,583 ****
                   (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
--- 595,601 ----
                   (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
***************
*** 604,619 ****
        (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))
--- 622,633 ----
        (catch 'var-found-1
        (let ((varnum (match-string 1)))
          (dolist (var gdb-var-list)
!           (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))
***************
*** 1661,1667 ****
        (while (< (point) (point-max))
          (setq bl (line-beginning-position)
                el (line-end-position))
!         (unless (looking-at "No ")
            (add-text-properties bl el
                                 '(mouse-face highlight
                                   help-echo "mouse-2, RET: Select frame")))
--- 1675,1681 ----
        (while (< (point) (point-max))
          (setq bl (line-beginning-position)
                el (line-end-position))
!         (when (looking-at "#")
            (add-text-properties bl el
                                 '(mouse-face highlight
                                   help-echo "mouse-2, RET: Select frame")))