[Emacs-diffs] Changes to emacs/lisp/gdb-ui.el

[Nick Roberts]

Index: emacs/lisp/gdb-ui.el
diff -c emacs/lisp/gdb-ui.el:1.38 emacs/lisp/gdb-ui.el:1.39
*** emacs/lisp/gdb-ui.el:1.38   Mon Jul  7 14:53:42 2003
--- emacs/lisp/gdb-ui.el        Mon Jul 28 15:49:30 2003
***************
*** 558,566 ****
      ("field-end" gdb-field-end)
      ) "An assoc mapping annotation tags to functions which process them.")
  
- (defun gdb-ignore-annotation (args)
-   nil)
- 
  (defconst gdb-source-spec-regexp
    "\\(.*\\):\\([0-9]*\\):[0-9]*:[a-z]*:\\(0x[a-f0-9]*\\)")
  
--- 558,563 ----
***************
*** 2002,2012 ****
  
  ;;; Shared keymap initialization:
  
- (define-key gud-menu-map [gdb-many-windows]
-   (menu-bar-make-toggle gdb-many-windows gdb-many-windows
-                       "Display other windows" "Many Windows %s"
-                       "Display locals, stack and breakpoint information"))
- 
  (let ((menu (make-sparse-keymap "GDB-Frames")))
    (define-key gud-menu-map [frames]
      `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
--- 1999,2004 ----
***************
*** 2034,2040 ****
  )
  
  (let ((menu (make-sparse-keymap "View")))
!    (define-key gud-menu-map [view] `(menu-item "View" ,menu))
  ;  (define-key menu [both] '(menu-item "Both" gdb-view-both
  ;            :help "Display both source and assembler"
  ;            :button (:radio . (eq gdb-selected-view 'both))))
--- 2026,2033 ----
  )
  
  (let ((menu (make-sparse-keymap "View")))
!    (define-key gud-menu-map [view] 
!      `(menu-item "View" ,menu :visible (eq gud-minor-mode 'gdba)))
  ;  (define-key menu [both] '(menu-item "Both" gdb-view-both
  ;            :help "Display both source and assembler"
  ;            :button (:radio . (eq gdb-selected-view 'both))))
***************
*** 2045,2050 ****
--- 2038,2053 ----
               :help "Display source only"
               :button (:radio . (eq gdb-selected-view 'source)))))
  
+ (let ((menu (make-sparse-keymap "GDB-UI")))
+   (define-key gud-menu-map [ui]
+     `(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba)))
+   (define-key menu [gdb-restore-windows]
+     '("Restore window layout" . gdb-restore-windows))
+   (define-key menu [gdb-many-windows]
+     (menu-bar-make-toggle gdb-many-windows gdb-many-windows
+                         "Display other windows" "Many Windows %s"
+                         "Display locals, stack and breakpoint information")))
+ 
  (defun gdb-frame-gdb-buffer ()
    (interactive)
    (switch-to-buffer-other-frame
***************
*** 2091,2097 ****
    (other-window 1)
    (switch-to-buffer (gdb-locals-buffer-name))
    (other-window 1)
!   (if gdb-view-source
        (switch-to-buffer
         (if gud-last-last-frame
           (gud-find-file (car gud-last-last-frame))
--- 2094,2101 ----
    (other-window 1)
    (switch-to-buffer (gdb-locals-buffer-name))
    (other-window 1)
!   (if (and gdb-view-source 
!          (eq gdb-selected-view 'source))
        (switch-to-buffer
         (if gud-last-last-frame
           (gud-find-file (car gud-last-last-frame))
***************
*** 2136,2142 ****
      (delete-other-windows)
      (split-window)
      (other-window 1)
!     (if gdb-view-source
        (switch-to-buffer
         (if gud-last-last-frame
             (gud-find-file (car gud-last-last-frame))
--- 2140,2147 ----
      (delete-other-windows)
      (split-window)
      (other-window 1)
!     (if (and gdb-view-source 
!          (eq gdb-selected-view 'source))
        (switch-to-buffer
         (if gud-last-last-frame
             (gud-find-file (car gud-last-last-frame))