[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.104 
emacs/lisp/progmodes/gdb-ui.el:1.105
*** emacs/lisp/progmodes/gdb-ui.el:1.104        Mon Oct 31 09:28:48 2005
--- emacs/lisp/progmodes/gdb-ui.el      Mon Oct 31 21:13:15 2005
***************
*** 214,225 ****
    :group 'gud
    :version "22.1")
  
- (defcustom gdb-use-inferior-io-buffer nil
-   "Non-nil means display output from the inferior in a separate buffer."
-   :type 'boolean
-   :group 'gud
-   :version "22.1")
- 
  (defcustom gdb-cpp-define-alist-program "gcc -E -dM -"
    "Shell command for generating a list of defined macros in a source file.
  This list is used to display the #define directive associated
--- 214,219 ----
***************
*** 245,250 ****
--- 239,267 ----
    :group 'gud
    :version "22.1")
  
+ 
+ (defcustom gdb-use-inferior-io-buffer nil
+   "Non-nil means display output from the inferior in a separate buffer."
+   :type 'boolean
+   :group 'gud
+   :version "22.1")
+ 
+ (defun gdb-use-inferior-io-buffer (arg)
+   "Toggle separate IO for inferior.
+ With arg, use separate IO iff arg is positive."
+   (interactive "P")
+   (setq gdb-use-inferior-io-buffer
+       (if (null arg)
+           (not gdb-use-inferior-io-buffer)
+         (> (prefix-numeric-value arg) 0)))
+   (if (and gud-comint-buffer
+          (buffer-name gud-comint-buffer))
+       (condition-case nil
+         (if gdb-use-inferior-io-buffer
+             (gdb-restore-windows)
+           (kill-buffer (gdb-inferior-io-name)))
+       (error nil))))
+ 
  (defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
  
  (defun gdb-create-define-alist ()
***************
*** 2315,2325 ****
    (define-key gud-menu-map [ui]
      `(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba)))
    (define-key menu [gdb-use-inferior-io]
!     ;; See defadvice below.
!     (menu-bar-make-toggle toggle-gdb-use-inferior-io-buffer
!                         gdb-use-inferior-io-buffer
!      "Separate inferior IO" "Use separate IO %s"
!      "Toggle separate IO for inferior."))
    (define-key menu [gdb-many-windows]
    '(menu-item "Display Other Windows" gdb-many-windows
              :help "Toggle display of locals, stack and breakpoint information"
--- 2332,2340 ----
    (define-key gud-menu-map [ui]
      `(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba)))
    (define-key menu [gdb-use-inferior-io]
!   '(menu-item "Separate inferior IO" gdb-use-inferior-io-buffer
!             :help "Toggle separate IO for inferior."
!             :button (:toggle . gdb-use-inferior-io-buffer)))
    (define-key menu [gdb-many-windows]
    '(menu-item "Display Other Windows" gdb-many-windows
              :help "Toggle display of locals, stack and breakpoint information"
***************
*** 2328,2338 ****
    '(menu-item "Restore Window Layout" gdb-restore-windows
              :help "Restore standard layout for debug session.")))
  
- ;; This function is defined above through a macro.
- (defadvice toggle-gdb-use-inferior-io-buffer (after gdb-kill-io-buffer 
activate)
-   (unless gdb-use-inferior-io-buffer
-     (kill-buffer (gdb-inferior-io-name))))
- 
  (defun gdb-frame-gdb-buffer ()
    "Display GUD buffer in a new frame."
    (interactive)
--- 2343,2348 ----
***************
*** 2392,2398 ****
    :version "22.1")
  
  (defun gdb-many-windows (arg)
!   "Toggle the number of windows in the basic arrangement."
    (interactive "P")
    (setq gdb-many-windows
        (if (null arg)
--- 2402,2409 ----
    :version "22.1")
  
  (defun gdb-many-windows (arg)
!   "Toggle the number of windows in the basic arrangement.
! With arg, display additional buffers iff arg is positive."
    (interactive "P")
    (setq gdb-many-windows
        (if (null arg)