[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.38 emacs/lisp/progmodes/gdb-ui.el:1.39
*** emacs/lisp/progmodes/gdb-ui.el:1.38 Wed Jan 19 06:55:57 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun Jan 23 20:57:41 2005
***************
*** 1243,1249 ****
      (define-key map "d" 'gdb-delete-breakpoint)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-goto-breakpoint)
!     (define-key map [mouse-2] 'gdb-mouse-goto-breakpoint)
      map))
  
  (defun gdb-breakpoints-mode ()
--- 1243,1249 ----
      (define-key map "d" 'gdb-delete-breakpoint)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-goto-breakpoint)
!     (define-key map [mouse-2] 'gdb-goto-breakpoint)
      map))
  
  (defun gdb-breakpoints-mode ()
***************
*** 1291,1299 ****
        (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
      (error "Not recognized as break/watchpoint line")))
  
! (defun gdb-goto-breakpoint ()
    "Display the breakpoint location specified at current line."
!   (interactive)
    (save-excursion
      (beginning-of-line 1)
      (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
--- 1291,1300 ----
        (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
      (error "Not recognized as break/watchpoint line")))
  
! (defun gdb-goto-breakpoint (&optional event)
    "Display the breakpoint location specified at current line."
!   (interactive (list last-input-event))
!   (if event (mouse-set-point event))
    (save-excursion
      (beginning-of-line 1)
      (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
***************
*** 1311,1324 ****
                (goto-line (string-to-number line))
                (set-window-point window (point))))))
        (error "Not recognized as break/watchpoint line"))))
- 
- (defun gdb-mouse-goto-breakpoint (event)
-   "Display the breakpoint location that you click on."
-   (interactive "e")
-   (mouse-set-point event)
-   (gdb-goto-breakpoint))
  
! ;;
  ;; Frames buffer.  This displays a perpetually correct bactracktrace
  ;; (from the command `where').
  ;;
--- 1312,1319 ----
                (goto-line (string-to-number line))
                (set-window-point window (point))))))
        (error "Not recognized as break/watchpoint line"))))
  
! 
  ;; Frames buffer.  This displays a perpetually correct bactracktrace
  ;; (from the command `where').
  ;;
***************
*** 1372,1378 ****
      (suppress-keymap map)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-frames-select)
!     (define-key map [mouse-2] 'gdb-frames-mouse-select)
      map))
  
  (defun gdb-frames-mode ()
--- 1367,1373 ----
      (suppress-keymap map)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-frames-select)
!     (define-key map [mouse-2] 'gdb-frames-select)
      map))
  
  (defun gdb-frames-mode ()
***************
*** 1396,1415 ****
           (n (or (and pos (match-string-no-properties 1)) "0")))
        n)))
  
! (defun gdb-frames-select ()
    "Select the frame and display the relevant source."
!   (interactive)
    (gdb-enqueue-input
     (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n") 
'ignore))
    (gud-display-frame))
- 
- (defun gdb-frames-mouse-select (event)
-   "Select the frame you click on and display the relevant source."
-   (interactive "e")
-   (mouse-set-point event)
-   (gdb-frames-select))
  
! ;;
  ;; Threads buffer.  This displays a selectable thread list.
  ;;
  (gdb-set-buffer-rules 'gdb-threads-buffer
--- 1391,1405 ----
           (n (or (and pos (match-string-no-properties 1)) "0")))
        n)))
  
! (defun gdb-frames-select (&optional event)
    "Select the frame and display the relevant source."
!   (interactive (list last-input-event))
!   (if event (mouse-set-point event))
    (gdb-enqueue-input
     (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n") 
'ignore))
    (gud-display-frame))
  
! 
  ;; Threads buffer.  This displays a selectable thread list.
  ;;
  (gdb-set-buffer-rules 'gdb-threads-buffer
***************
*** 1454,1460 ****
      (suppress-keymap map)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-threads-select)
!     (define-key map [mouse-2] 'gdb-threads-mouse-select)
      map))
  
  (defun gdb-threads-mode ()
--- 1444,1450 ----
      (suppress-keymap map)
      (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-threads-select)
!     (define-key map [mouse-2] 'gdb-threads-select)
      map))
  
  (defun gdb-threads-mode ()
***************
*** 1474,1493 ****
      (re-search-backward "^\\s-*\\([0-9]*\\)" nil t)
      (match-string-no-properties 1)))
  
! (defun gdb-threads-select ()
    "Select the thread and display the relevant source."
!   (interactive)
    (gdb-enqueue-input
     (list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
    (gud-display-frame))
- 
- (defun gdb-threads-mouse-select (event)
-   "Select the thread you click on and display the relevant source."
-   (interactive "e")
-   (mouse-set-point event)
-   (gdb-threads-select))
  
! ;;
  ;; Registers buffer.
  ;;
  (gdb-set-buffer-rules 'gdb-registers-buffer
--- 1464,1478 ----
      (re-search-backward "^\\s-*\\([0-9]*\\)" nil t)
      (match-string-no-properties 1)))
  
! (defun gdb-threads-select (&optional event)
    "Select the thread and display the relevant source."
!   (interactive (list last-input-event))
!   (if event (mouse-set-point event))
    (gdb-enqueue-input
     (list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
    (gud-display-frame))
  
! 
  ;; Registers buffer.
  ;;
  (gdb-set-buffer-rules 'gdb-registers-buffer