[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.33 emacs/lisp/gdb-ui.el:1.34
*** emacs/lisp/gdb-ui.el:1.33   Fri May 23 18:38:15 2003
--- emacs/lisp/gdb-ui.el        Sun May 25 12:51:34 2003
***************
*** 51,57 ****
  (require 'gud)
  
  (defcustom gdb-window-height 20
!   "*Number of lines in a frame for a displayed expression in GDB-UI."
    :type 'integer
    :group 'gud)
  
--- 51,57 ----
  (require 'gud)
  
  (defcustom gdb-window-height 20
!   "Number of lines in a frame for a displayed expression in GDB-UI."
    :type 'integer
    :group 'gud)
  
***************
*** 1384,1399 ****
                                    (remove-images start end)
                                    (if (eq ?y flag)
                                        (put-image breakpoint-enabled-icon
!                                                  (point)
                                                   "breakpoint icon enabled"
                                                   'left-margin)
!                                     (put-image breakpoint-disabled-icon 
(point)
                                                 "breakpoint icon disabled"
                                                 'left-margin)))
                                (gdb-remove-strings start end)
                                (if (eq ?y flag)
!                                   (gdb-put-string "B" (point))
!                                 (gdb-put-string "b" (point))))))))))))
          (end-of-line))))))
  
  (defun gdb-breakpoints-buffer-name ()
--- 1384,1400 ----
                                    (remove-images start end)
                                    (if (eq ?y flag)
                                        (put-image breakpoint-enabled-icon
!                                                  (+ start 1)
                                                   "breakpoint icon enabled"
                                                   'left-margin)
!                                     (put-image breakpoint-disabled-icon
!                                                (+ start 1)
                                                 "breakpoint icon disabled"
                                                 'left-margin)))
                                (gdb-remove-strings start end)
                                (if (eq ?y flag)
!                                   (gdb-put-string "B" (+ start 1))
!                                 (gdb-put-string "b" (+ start 1))))))))))))
          (end-of-line))))))
  
  (defun gdb-breakpoints-buffer-name ()
***************
*** 1985,1996 ****
      answer))
  
  (defun gdb-display-source-buffer (buffer)
!   (set-window-buffer gdb-source-window buffer)
    gdb-source-window)
  
  
  ;;; 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)))
--- 1986,2005 ----
      answer))
  
  (defun gdb-display-source-buffer (buffer)
!   (if (eq gdb-selected-view 'source)
!       (set-window-buffer gdb-source-window buffer)
!     (set-window-buffer gdb-source-window
!                      (gdb-get-buffer 'gdb-assembler-buffer)))
    gdb-source-window)
  
  
  ;;; 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)))
***************
*** 2091,2100 ****
    (switch-to-buffer (gdb-breakpoints-buffer-name))
    (other-window 1))
  
! (define-minor-mode gdb-many-windows
!   "Toggle the number of windows in the basic arrangement."
!   :group 'gud
!   :init-value nil
    (gdb-restore-windows))
  
  (defun gdb-restore-windows ()
--- 2100,2118 ----
    (switch-to-buffer (gdb-breakpoints-buffer-name))
    (other-window 1))
  
! (defcustom gdb-many-windows nil
!   "Nil means that gdb starts with just two windows : the GUD and
! the source buffer."
!   :type 'boolean
!   :group 'gud)
! 
! (defun gdb-many-windows (arg)
! "Toggle the number of windows in the basic arrangement."
!   (interactive "P")
!   (setq gdb-many-windows
!       (if (null arg)
!           (not gdb-many-windows)
!         (> (prefix-numeric-value arg) 0)))
    (gdb-restore-windows))
  
  (defun gdb-restore-windows ()
***************
*** 2309,2324 ****
                            (progn
                              (remove-images start end)
                              (if (eq ?y flag)
!                                 (put-image breakpoint-enabled-icon (point)
                                             "breakpoint icon enabled"
                                             'left-margin)
!                               (put-image breakpoint-disabled-icon (point)
                                           "breakpoint icon disabled"
                                           'left-margin)))
                          (gdb-remove-strings start end)
                          (if (eq ?y flag)
!                             (gdb-put-string "B" (point))
!                           (gdb-put-string "b" (point)))))))))))))
  
  (defvar gdb-assembler-mode-map
    (let ((map (make-sparse-keymap)))
--- 2327,2344 ----
                            (progn
                              (remove-images start end)
                              (if (eq ?y flag)
!                                 (put-image breakpoint-enabled-icon
!                                            (+ start 1)
                                             "breakpoint icon enabled"
                                             'left-margin)
!                               (put-image breakpoint-disabled-icon
!                                          (+ start 1)
                                           "breakpoint icon disabled"
                                           'left-margin)))
                          (gdb-remove-strings start end)
                          (if (eq ?y flag)
!                             (gdb-put-string "B" (+ start 1))
!                           (gdb-put-string "b" (+ start 1)))))))))))))
  
  (defvar gdb-assembler-mode-map
    (let ((map (make-sparse-keymap)))
***************
*** 2332,2337 ****
--- 2352,2358 ----
    (setq major-mode 'gdb-assembler-mode)
    (setq mode-name "Assembler")
    (setq left-margin-width 2)
+   (setq fringes-outside-margins t)
    (setq buffer-read-only t)
    (use-local-map gdb-assembler-mode-map)
    (gdb-invalidate-assembler)