[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.95 emacs/lisp/progmodes/gdb-ui.el:1.96
*** emacs/lisp/progmodes/gdb-ui.el:1.95 Fri Oct  7 02:46:50 2005
--- emacs/lisp/progmodes/gdb-ui.el      Mon Oct 10 12:26:05 2005
***************
*** 173,200 ****
  detailed description of this mode.
  
  
! ---------------------------------------------------------------------
!                                GDB Toolbar
! ---------------------------------------------------------------------
!  GUD buffer (I/O of GDB)          | Locals buffer
!                                   |
!                                   |
!                                   |
! ---------------------------------------------------------------------
!  Source buffer                    | Input/Output (of inferior) buffer
!                                   | (comint-mode)
!                                   |
!                                   |
!                                   |
!                                   |
!                                   |
!                                   |
! ---------------------------------------------------------------------
!  Stack buffer                     | Breakpoints buffer
!  RET      gdb-frames-select       | SPC    gdb-toggle-breakpoint
!                                   | RET    gdb-goto-breakpoint
!                                   |   d    gdb-delete-breakpoint
! ---------------------------------------------------------------------"
    ;;
    (interactive (list (gud-query-cmdline 'gdba)))
    ;;
--- 173,200 ----
  detailed description of this mode.
  
  
! +--------------------------------------------------------------+
! |                           GDB Toolbar                        |
! +-------------------------------+------------------------------+
! | GUD buffer (I/O of GDB)       | Locals buffer                |
! |                               |                              |
! |                               |                              |
! |                               |                              |
! +-------------------------------+------------------------------+
! | Source buffer                 | I/O buffer (of inferior)     |
! |                               | (comint-mode)                |
! |                               |                              |
! |                               |                              |
! |                               |                              |
! |                               |                              |
! |                               |                              |
! |                               |                              |
! +-------------------------------+------------------------------+
! | Stack buffer                  | Breakpoints buffer           |
! | RET      gdb-frames-select    | SPC    gdb-toggle-breakpoint |
! |                               | RET    gdb-goto-breakpoint   |
! |                               | d      gdb-delete-breakpoint |
! +-------------------------------+------------------------------+"
    ;;
    (interactive (list (gud-query-cmdline 'gdba)))
    ;;
***************
*** 1192,1203 ****
       (let ((buf (gdb-get-buffer ',buf-key)))
         (and buf
            (with-current-buffer buf
!             (let ((p (window-point (get-buffer-window buf 0)))
                    (buffer-read-only nil))
                (erase-buffer)
                (insert-buffer-substring (gdb-get-create-buffer
                                          'gdb-partial-output-buffer))
!               (set-window-point (get-buffer-window buf 0) p)))))
       ;; put customisation here
       (,custom-defun)))
  
--- 1192,1204 ----
       (let ((buf (gdb-get-buffer ',buf-key)))
         (and buf
            (with-current-buffer buf
!             (let* ((window (get-buffer-window buf 0))
!                    (p (window-point window))
                    (buffer-read-only nil))
                (erase-buffer)
                (insert-buffer-substring (gdb-get-create-buffer
                                          'gdb-partial-output-buffer))
!               (set-window-point window p)))))
       ;; put customisation here
       (,custom-defun)))
  
***************
*** 2125,2137 ****
        (while (re-search-forward "\\s-*{.*\n" nil t)
        (replace-match " (array);\n" nil nil))))
    (let ((buf (gdb-get-buffer 'gdb-locals-buffer)))
!     (and buf (with-current-buffer buf
!              (let ((p (window-point (get-buffer-window buf 0)))
                     (buffer-read-only nil))
                 (erase-buffer)
                 (insert-buffer-substring (gdb-get-create-buffer
                                           'gdb-partial-output-buffer))
!               (set-window-point (get-buffer-window buf 0) p)))))
    (run-hooks 'gdb-info-locals-hook))
  
  (defun gdb-info-locals-custom ()
--- 2126,2140 ----
        (while (re-search-forward "\\s-*{.*\n" nil t)
        (replace-match " (array);\n" nil nil))))
    (let ((buf (gdb-get-buffer 'gdb-locals-buffer)))
!     (and buf
!        (with-current-buffer buf
!             (let* ((window (get-buffer-window buf 0))
!                    (p (window-point window))
                     (buffer-read-only nil))
                 (erase-buffer)
                 (insert-buffer-substring (gdb-get-create-buffer
                                           'gdb-partial-output-buffer))
!               (set-window-point window p)))))
    (run-hooks 'gdb-info-locals-hook))
  
  (defun gdb-info-locals-custom ()
***************
*** 2528,2537 ****
        (when (< left-margin-width 2)
        (save-current-buffer
          (setq left-margin-width 2)
!         (if (get-buffer-window (current-buffer) 0)
              (set-window-margins
!              (get-buffer-window (current-buffer) 0)
!              left-margin-width right-margin-width))))
        (gdb-put-string
         (propertize putstring
                   'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
--- 2531,2540 ----
        (when (< left-margin-width 2)
        (save-current-buffer
          (setq left-margin-width 2)
!         (let ((window (get-buffer-window (current-buffer) 0)))
!           (if window
              (set-window-margins
!              window left-margin-width right-margin-width)))))
        (gdb-put-string
         (propertize putstring
                   'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
***************
*** 2543,2552 ****
        (remove-images start end))
    (when remove-margin
      (setq left-margin-width 0)
!     (if (get-buffer-window (current-buffer) 0)
!       (set-window-margins
!        (get-buffer-window (current-buffer) 0)
!        left-margin-width right-margin-width))))
  
  
  ;;
--- 2546,2555 ----
        (remove-images start end))
    (when remove-margin
      (setq left-margin-width 0)
!     (let ((window (get-buffer-window (current-buffer) 0)))
!       (if window
!         (set-window-margins
!          window left-margin-width right-margin-width)))))
  
  
  ;;