[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.43 emacs/lisp/progmodes/gdb-ui.el:1.44
*** emacs/lisp/progmodes/gdb-ui.el:1.43 Tue Feb  1 20:11:09 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sat Feb  5 05:31:36 2005
***************
*** 4,10 ****
  ;; Maintainer: FSF
  ;; Keywords: unix, tools
  
! ;; Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  ;; Maintainer: FSF
  ;; Keywords: unix, tools
  
! ;; Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
***************
*** 1890,1907 ****
  
  ;;; Shared keymap initialization:
  
- (let ((menu (make-sparse-keymap "GDB-Frames")))
-   (define-key gud-menu-map [frames]
-     `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
-   (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
-   (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
-   (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
-   (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
-   (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
-   (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
-   (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
-   (define-key menu [breakpoints] '("Breakpoints" . 
gdb-frame-breakpoints-buffer)))
- 
  (let ((menu (make-sparse-keymap "GDB-Windows")))
    (define-key gud-menu-map [displays]
      `(menu-item "GDB-Windows" ,menu :visible (eq gud-minor-mode 'gdba)))
--- 1890,1895 ----
***************
*** 1914,1928 ****
    (define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
    (define-key menu [breakpoints] '("Breakpoints" . 
gdb-display-breakpoints-buffer)))
  
  (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 ()
    "Display GUD buffer in a new frame."
--- 1902,1928 ----
    (define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
    (define-key menu [breakpoints] '("Breakpoints" . 
gdb-display-breakpoints-buffer)))
  
+ (let ((menu (make-sparse-keymap "GDB-Frames")))
+   (define-key gud-menu-map [frames]
+     `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
+   (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
+   (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
+   (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
+   (define-key menu [assembler] '("Machine" . gdb-frame-assembler-buffer))
+   (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
+   (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
+   (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
+   (define-key menu [breakpoints] '("Breakpoints" . 
gdb-frame-breakpoints-buffer)))
+ 
  (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"
!      "Toggle display of locals, stack and breakpoint information")))
  
  (defun gdb-frame-gdb-buffer ()
    "Display GUD buffer in a new frame."