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

[Juanma Barranquero]

Index: emacs/lisp/gdb-ui.el
diff -c emacs/lisp/gdb-ui.el:1.24 emacs/lisp/gdb-ui.el:1.25
*** emacs/lisp/gdb-ui.el:1.24   Tue Jan 14 18:58:13 2003
--- emacs/lisp/gdb-ui.el        Tue Feb  4 06:21:47 2003
***************
*** 41,47 ****
  ;; developing the mode itself, then see the Annotations section in the GDB
  ;; info manual.
  ;;
! ;;  Known Bugs: Does not auto-display arrays of structures or structures 
  ;;  containing arrays.
  
  ;;; Code:
--- 41,47 ----
  ;; developing the mode itself, then see the Annotations section in the GDB
  ;; info manual.
  ;;
! ;;  Known Bugs: Does not auto-display arrays of structures or structures
  ;;  containing arrays.
  
  ;;; Code:
***************
*** 116,122 ****
  
  `gdb-many-windows'    - Toggle the number of windows gdb uses.
  `gdb-restore-windows' - To restore the window layout.
! `gdb-quit'            - To delete (most) of the buffers used by GDB-UI and 
                          reset variables."
    ;;
    (interactive (list (gud-query-cmdline 'gdba)))
--- 116,122 ----
  
  `gdb-many-windows'    - Toggle the number of windows gdb uses.
  `gdb-restore-windows' - To restore the window layout.
! `gdb-quit'            - To delete (most) of the buffers used by GDB-UI and
                          reset variables."
    ;;
    (interactive (list (gud-query-cmdline 'gdba)))
***************
*** 530,536 ****
      ("display-end" gdb-display-end)
  ; GDB commands info stack, info locals and frame generate an error-begin
  ; annotation at start when there is no stack but this is a quirk/bug in
! ; annotations.  
  ;    ("error-begin" gdb-error-begin)
      ("display-number-end" gdb-display-number-end)
      ("array-section-begin" gdb-array-section-begin)
--- 530,536 ----
      ("display-end" gdb-display-end)
  ; GDB commands info stack, info locals and frame generate an error-begin
  ; annotation at start when there is no stack but this is a quirk/bug in
! ; annotations.
  ;    ("error-begin" gdb-error-begin)
      ("display-number-end" gdb-display-number-end)
      ("array-section-begin" gdb-array-section-begin)
***************
*** 582,588 ****
        (let ((handler
             (car (cdr (gdb-get-current-item)))))
        (save-excursion
!         (set-buffer (gdb-get-create-buffer 
                       'gdb-partial-output-buffer))
          (funcall handler))))
       (t
--- 582,588 ----
        (let ((handler
             (car (cdr (gdb-get-current-item)))))
        (save-excursion
!         (set-buffer (gdb-get-create-buffer
                       'gdb-partial-output-buffer))
          (funcall handler))))
       (t
***************
*** 590,596 ****
        (error "Output sink phase error 1")))))
  
  (defun gdb-prompt (ignored)
!   "An annotation handler for `prompt'. 
  This sends the next command (if any) to gdb."
    (let ((sink (gdb-get-output-sink)))
      (cond
--- 590,596 ----
        (error "Output sink phase error 1")))))
  
  (defun gdb-prompt (ignored)
!   "An annotation handler for `prompt'.
  This sends the next command (if any) to gdb."
    (let ((sink (gdb-get-output-sink)))
      (cond
***************
*** 714,720 ****
              (if (string-equal (frame-parameter frame 'name)
                                gdb-expression-buffer-name)
                  (throw 'frame-exists nil)))
!           (make-frame `((height . ,gdb-window-height) 
                          (width . ,gdb-window-width)
                          (tool-bar-lines . nil)
                          (menu-bar-lines . nil)
--- 714,720 ----
              (if (string-equal (frame-parameter frame 'name)
                                gdb-expression-buffer-name)
                  (throw 'frame-exists nil)))
!           (make-frame `((height . ,gdb-window-height)
                          (width . ,gdb-window-width)
                          (tool-bar-lines . nil)
                          (menu-bar-lines . nil)
***************
*** 1082,1088 ****
        ;; It is either concatenated to OUTPUT or directed
        ;; elsewhere.
        (setq output
!             (gdb-concat-output 
               output
               (substring burst 0 (match-beginning 0))))
  
--- 1082,1088 ----
        ;; It is either concatenated to OUTPUT or directed
        ;; elsewhere.
        (setq output
!             (gdb-concat-output
               output
               (substring burst 0 (match-beginning 0))))
  
***************
*** 1262,1268 ****
    gdb-info-breakpoints-custom)
  
  (defvar gdb-cdir nil "Compilation directory.")
! (defvar breakpoint-enabled-icon) 
  (defvar breakpoint-disabled-icon)
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
--- 1262,1268 ----
    gdb-info-breakpoints-custom)
  
  (defvar gdb-cdir nil "Compilation directory.")
! (defvar breakpoint-enabled-icon)
  (defvar breakpoint-disabled-icon)
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
***************
*** 1299,1305 ****
                                           'mouse-face 'highlight)
                        (save-excursion
                          (set-buffer
!                          (find-file-noselect 
                            (if (file-exists-p file) file
                              (expand-file-name file gdb-cdir))))
                          (save-current-buffer
--- 1299,1305 ----
                                           'mouse-face 'highlight)
                        (save-excursion
                          (set-buffer
!                          (find-file-noselect
                            (if (file-exists-p file) file
                              (expand-file-name file gdb-cdir))))
                          (save-current-buffer
***************
*** 1315,1328 ****
                          ;; only want one breakpoint icon at each location
                          (save-excursion
                            (goto-line (string-to-number line))
!                           (let ((start (progn (beginning-of-line) 
                                                (- (point) 1)))
                                  (end (progn (end-of-line) (+ (point) 1))))
                              (if (display-graphic-p)
                                  (progn
                                    (remove-images start end)
                                    (if (eq ?y flag)
!                                       (put-image breakpoint-enabled-icon 
                                                   (point)
                                                   "breakpoint icon enabled"
                                                   'left-margin)
--- 1315,1328 ----
                          ;; only want one breakpoint icon at each location
                          (save-excursion
                            (goto-line (string-to-number line))
!                           (let ((start (progn (beginning-of-line)
                                                (- (point) 1)))
                                  (end (progn (end-of-line) (+ (point) 1))))
                              (if (display-graphic-p)
                                  (progn
                                    (remove-images start end)
                                    (if (eq ?y flag)
!                                       (put-image breakpoint-enabled-icon
                                                   (point)
                                                   "breakpoint icon enabled"
                                                   'left-margin)
***************
*** 1387,1393 ****
         (list
        (concat
         (if (eq ?y (char-after (match-beginning 2)))
!            "server disable " 
           "server enable ")
         (match-string 1) "\n")
        'ignore)))))
--- 1387,1393 ----
         (list
        (concat
         (if (eq ?y (char-after (match-beginning 2)))
!            "server disable "
           "server enable ")
         (match-string 1) "\n")
        'ignore)))))
***************
*** 1564,1570 ****
    gdb-info-locals-handler
    gdb-info-locals-custom)
  
! ;; Abbreviate for arrays and structures. 
  ;; These can be expanded using gud-display.
  (defun gdb-info-locals-handler nil
    (gdb-set-pending-triggers (delq 'gdb-invalidate-locals
--- 1564,1570 ----
    gdb-info-locals-handler
    gdb-info-locals-custom)
  
! ;; Abbreviate for arrays and structures.
  ;; These can be expanded using gud-display.
  (defun gdb-info-locals-handler nil
    (gdb-set-pending-triggers (delq 'gdb-invalidate-locals
***************
*** 1646,1652 ****
        (while (< (point) (- (point-max) 1))
        (forward-line 1)
        (if (looking-at "\\([0-9]+\\):   \\([ny]\\)")
!           (setq display-list 
                  (cons (string-to-int (match-string 1)) display-list)))
        (end-of-line)))
      (if (not (display-graphic-p))
--- 1646,1652 ----
        (while (< (point) (- (point-max) 1))
        (forward-line 1)
        (if (looking-at "\\([0-9]+\\):   \\([ny]\\)")
!           (setq display-list
                  (cons (string-to-int (match-string 1)) display-list)))
        (end-of-line)))
      (if (not (display-graphic-p))
***************
*** 1654,1663 ****
          (dolist (buffer (buffer-list))
            (if (string-match "\\*display \\([0-9]+\\)\\*" (buffer-name buffer))
                (progn
!                 (let ((number 
                         (match-string 1 (buffer-name buffer))))
                    (if (not (memq (string-to-int number) display-list))
!                       (kill-buffer 
                         (get-buffer (concat "*display " number "*")))))))))
        (gdb-delete-frames display-list))))
  
--- 1654,1663 ----
          (dolist (buffer (buffer-list))
            (if (string-match "\\*display \\([0-9]+\\)\\*" (buffer-name buffer))
                (progn
!                 (let ((number
                         (match-string 1 (buffer-name buffer))))
                    (if (not (memq (string-to-int number) display-list))
!                       (kill-buffer
                         (get-buffer (concat "*display " number "*")))))))))
        (gdb-delete-frames display-list))))
  
***************
*** 2233,2249 ****
  
  (defun gdb-get-current-frame ()
    (if (not (member 'gdb-get-current-frame (gdb-get-pending-triggers)))
!       (progn 
        (gdb-enqueue-idle-input
         (list (concat "server frame\n") 'gdb-frame-handler))
!       (gdb-set-pending-triggers 
         (cons 'gdb-get-current-frame
               (gdb-get-pending-triggers))))))
  
  (defun gdb-frame-handler ()
!   (gdb-set-pending-triggers 
     (delq 'gdb-get-current-frame (gdb-get-pending-triggers)))
!   (save-excursion 
      (set-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer))
      (goto-char (point-min))
      (if (looking-at "^#[0-9]*\\s-*0x\\S-* in \\(\\S-*\\)")
--- 2233,2249 ----
  
  (defun gdb-get-current-frame ()
    (if (not (member 'gdb-get-current-frame (gdb-get-pending-triggers)))
!       (progn
        (gdb-enqueue-idle-input
         (list (concat "server frame\n") 'gdb-frame-handler))
!       (gdb-set-pending-triggers
         (cons 'gdb-get-current-frame
               (gdb-get-pending-triggers))))))
  
  (defun gdb-frame-handler ()
!   (gdb-set-pending-triggers
     (delq 'gdb-get-current-frame (gdb-get-pending-triggers)))
!   (save-excursion
      (set-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer))
      (goto-char (point-min))
      (if (looking-at "^#[0-9]*\\s-*0x\\S-* in \\(\\S-*\\)")