[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.57 emacs/lisp/progmodes/gud.el:1.58
*** emacs/lisp/progmodes/gud.el:1.57    Sun Oct  9 20:22:43 2005
--- emacs/lisp/progmodes/gud.el Mon Oct 10 12:25:04 2005
***************
*** 352,357 ****
--- 352,360 ----
      (define-key gud-speedbar-key-map "j" 'speedbar-edit-line)
      (define-key gud-speedbar-key-map "e" 'speedbar-edit-line)
      (define-key gud-speedbar-key-map "\C-m" 'speedbar-edit-line)
+     (define-key gud-speedbar-key-map " " 'speedbar-toggle-line-expansion)
+     (define-key gud-speedbar-key-map "[" 'speedbar-expand-line-descendants)
+     (define-key gud-speedbar-key-map "]" 'speedbar-contract-line-descendants)
      (define-key gud-speedbar-key-map "D" 'gdb-var-delete))
  
    (speedbar-add-expansion-list '("GUD" gud-speedbar-menu-items
***************
*** 389,395 ****
             gud-comint-buffer
             ;; gud-comint-buffer might be killed
             (buffer-name gud-comint-buffer))
!     (let ((minor-mode (with-current-buffer buffer gud-minor-mode)))
        (cond
         ((memq minor-mode '(gdbmi gdba))
        (when (or gdb-var-changed
--- 392,400 ----
             gud-comint-buffer
             ;; gud-comint-buffer might be killed
             (buffer-name gud-comint-buffer))
!     (let* ((minor-mode (with-current-buffer buffer gud-minor-mode))
!         (window (get-buffer-window (current-buffer) 0))
!         (p (window-point window)))
        (cond
         ((memq minor-mode '(gdbmi gdba))
        (when (or gdb-var-changed
***************
*** 454,460 ****
                        'gud-gdb-goto-stackframe)
                       (t (error "Should never be here")))
                 frame t))))
!           (setq gud-last-speedbar-stackframe gud-last-last-frame)))))))
  
  
  ;; ======================================================================
--- 459,466 ----
                        'gud-gdb-goto-stackframe)
                       (t (error "Should never be here")))
                 frame t))))
!           (setq gud-last-speedbar-stackframe gud-last-last-frame))))
!       (set-window-point window p))))
  
  
  ;; ======================================================================
***************
*** 2569,2574 ****
--- 2575,2583 ----
         ;; Stop displaying an arrow in a source file.
         (setq gud-overlay-arrow-position nil)
         (set-process-buffer proc nil)
+        (if (featurep 'speedbar)
+            (speedbar-change-initial-expansion-list
+             speedbar-previously-used-expansion-list-name))
         (if (memq gud-minor-mode-type '(gdbmi gdba))
             (gdb-reset)
           (gud-reset)))