[Emacs-diffs] Changes to emacs/lisp/progmodes/gud.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gud.el
diff -c emacs/lisp/progmodes/gud.el:1.75 emacs/lisp/progmodes/gud.el:1.76
*** emacs/lisp/progmodes/gud.el:1.75    Fri Nov 18 02:48:58 2005
--- emacs/lisp/progmodes/gud.el Thu Nov 24 00:36:03 2005
***************
*** 52,57 ****
--- 52,58 ----
  (defvar gdb-show-changed-values)
  (defvar gdb-var-changed)
  (defvar gdb-var-list)
+ (defvar gdb-speedbar-auto-raise)
  (defvar tool-bar-map)
  
  ;; ======================================================================
***************
*** 410,415 ****
--- 411,420 ----
                (memq gud-minor-mode '(gdbmi gdba)))]
      ["Delete expression" gdb-var-delete
       (with-current-buffer gud-comint-buffer
+        (memq gud-minor-mode '(gdbmi gdba)))]
+     ["Auto raise frame" gdb-speedbar-auto-raise
+      :style toggle :selected gdb-speedbar-auto-raise
+      :visible (with-current-buffer gud-comint-buffer
         (memq gud-minor-mode '(gdbmi gdba)))])
    "Additional menu items to add to the speedbar frame.")
  
***************
*** 444,449 ****
--- 449,456 ----
                           (looking-at "Watch Expressions:")))))
          (erase-buffer)
          (insert "Watch Expressions:\n")
+         (if gdb-speedbar-auto-raise
+             (raise-frame speedbar-frame))
          (let ((var-list gdb-var-list))
            (while var-list
              (let* ((depth 0) (start 0) (char ?+)
***************
*** 453,459 ****
                        start (1+ (match-beginning 0))))
                (if (or (equal (nth 2 var) "0")
                        (and (equal (nth 2 var) "1")
!                            (string-match "char \\*" (nth 3 var))))
                    (speedbar-make-tag-line 'bracket ?? nil nil
                                            (concat (car var) "\t" (nth 4 var))
                                            'gdb-edit-value
--- 460,466 ----
                        start (1+ (match-beginning 0))))
                (if (or (equal (nth 2 var) "0")
                        (and (equal (nth 2 var) "1")
!                            (string-match "char \\*$" (nth 3 var))))
                    (speedbar-make-tag-line 'bracket ?? nil nil
                                            (concat (car var) "\t" (nth 4 var))
                                            'gdb-edit-value
***************
*** 465,474 ****
                  (if (and (cadr var-list)
                           (string-match varnum (cadr (cadr var-list))))
                      (setq char ?-))
                  (speedbar-make-tag-line 'bracket char
                                          'gdb-speedbar-expand-node varnum
                                          (concat (car var) "\t" (nth 3 var))
!                                         nil nil nil depth)))
              (setq var-list (cdr var-list))))
          (setq gdb-var-changed nil)))
         (t (if (and (save-excursion
--- 472,492 ----
                  (if (and (cadr var-list)
                           (string-match varnum (cadr (cadr var-list))))
                      (setq char ?-))
+                 (if (string-match "\\*$" (nth 3 var))
+                     (speedbar-make-tag-line 'bracket char
+                                             'gdb-speedbar-expand-node varnum
+                                             (concat (car var) "\t"
+                                                     (nth 3 var)"\t"
+                                                     (nth 4 var))
+                                             'gdb-edit-value nil
+                                             (if (and (nth 5 var)
+                                                      gdb-show-changed-values)
+                                                 'font-lock-warning-face
+                                               nil) depth)
                  (speedbar-make-tag-line 'bracket char
                                          'gdb-speedbar-expand-node varnum
                                          (concat (car var) "\t" (nth 3 var))
!                                         nil nil nil depth))))
              (setq var-list (cdr var-list))))
          (setq gdb-var-changed nil)))
         (t (if (and (save-excursion
***************
*** 3079,3084 ****
--- 3097,3104 ----
      ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face))
      ("^\\s-*\\([a-z]+\\)" (1 font-lock-keyword-face))))
  
+ ;; FIXME: The keyword "end" associated with "document"
+ ;; should have font-lock-keyword-face (currently font-lock-doc-face).
  (defvar gdb-script-font-lock-syntactic-keywords
    '(("^document\\s-.*\\(\n\\)" (1 "< b"))
      ;; It would be best to change the \n in front, but it's more difficult.