[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.105 
emacs/lisp/progmodes/gdb-ui.el:1.106
*** emacs/lisp/progmodes/gdb-ui.el:1.105        Mon Oct 31 21:13:15 2005
--- emacs/lisp/progmodes/gdb-ui.el      Wed Nov  2 10:44:00 2005
***************
*** 424,439 ****
    "Execute source lines by dragging the overlay arrow (fringe) with the 
mouse."
    (interactive "e")
    (if gud-overlay-arrow-position
!       (let ((start (event-start event))
!             (end  (event-end event))
!             (buffer (marker-buffer gud-overlay-arrow-position)) (line))
!         (if (equal buffer (window-buffer (posn-window end)))
!             (with-current-buffer buffer
!               (when (or (equal start end)
!                         (equal (posn-point start)
!                                (marker-position gud-overlay-arrow-position)))
!                 (setq line (line-number-at-pos (posn-point end)))
!                 (gud-call (concat "until " (number-to-string line)))))))))
  
  (defcustom gdb-use-colon-colon-notation nil
    "If non-nil use FUN::VAR format to display variables in the speedbar."
--- 424,451 ----
    "Execute source lines by dragging the overlay arrow (fringe) with the 
mouse."
    (interactive "e")
    (if gud-overlay-arrow-position
!       (let ((start (event-start event))
!           (end  (event-end event))
!           (buffer (marker-buffer gud-overlay-arrow-position)) (line))
!       (if (not (string-match "Machine" mode-name))
!           (if (equal buffer (window-buffer (posn-window end)))
!               (with-current-buffer buffer
!                 (when (or (equal start end)
!                           (equal (posn-point start)
!                                  (marker-position
!                                   gud-overlay-arrow-position)))
!                   (setq line (line-number-at-pos (posn-point end)))
!                   (gud-call (concat "until " (number-to-string line))))))
!         (if (equal (marker-buffer gdb-overlay-arrow-position)
!                    (window-buffer (posn-window end)))
!             (when (or (equal start end)
!                       (equal (posn-point start)
!                              (marker-position
!                               gdb-overlay-arrow-position)))
!               (save-excursion
!                 (goto-line (line-number-at-pos (posn-point end)))
!                 (forward-char 2)
!                 (gud-call (concat "until *%a")))))))))
  
  (defcustom gdb-use-colon-colon-notation nil
    "If non-nil use FUN::VAR format to display variables in the speedbar."
***************
*** 1032,1037 ****
--- 1044,1051 ----
  function is used to change the focus of GUD tooltips to #define
  directives."
    (setq gdb-active-process nil)
+   (setq gud-overlay-arrow-position nil)
+   (setq gdb-overlay-arrow-position nil)
    (gdb-stopping ignored))
  
  (defun gdb-frame-begin (ignored)
***************
*** 1613,1621 ****
        (while (< (point) (point-max))
          (setq bl (line-beginning-position)
                el (line-end-position))
!         (add-text-properties bl el
!                            '(mouse-face highlight
!                              help-echo "mouse-2, RET: Select frame"))
          (goto-char bl)
          (when (looking-at "^#\\([0-9]+\\)")
            (when (string-equal (match-string 1) gdb-frame-number)
--- 1627,1636 ----
        (while (< (point) (point-max))
          (setq bl (line-beginning-position)
                el (line-end-position))
!         (unless (looking-at "No ")
!           (add-text-properties bl el
!                                '(mouse-face highlight
!                                  help-echo "mouse-2, RET: Select frame")))
          (goto-char bl)
          (when (looking-at "^#\\([0-9]+\\)")
            (when (string-equal (match-string 1) gdb-frame-number)
***************
*** 1712,1720 ****
      (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!       (add-text-properties (line-beginning-position) (line-end-position)
!                            '(mouse-face highlight
!                              help-echo "mouse-2, RET: select thread"))
        (forward-line 1)))))
  
  (defun gdb-threads-buffer-name ()
--- 1727,1736 ----
      (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!       (unless (looking-at "No ")
!         (add-text-properties (line-beginning-position) (line-end-position)
!                              '(mouse-face highlight
!                                help-echo "mouse-2, RET: select thread")))
        (forward-line 1)))))
  
  (defun gdb-threads-buffer-name ()
***************
*** 1806,1813 ****
        (while (< (point) (point-max))
          (setq bl (line-beginning-position))
          (when (looking-at "^[^ ]+")
!           (put-text-property bl (match-end 0)
!                              'face font-lock-variable-name-face))
          (forward-line 1))))))
  
  (defvar gdb-registers-mode-map
--- 1822,1830 ----
        (while (< (point) (point-max))
          (setq bl (line-beginning-position))
          (when (looking-at "^[^ ]+")
!           (unless (string-equal (match-string 0) "The")
!             (put-text-property bl (match-end 0)
!                                'face font-lock-variable-name-face)))
          (forward-line 1))))))
  
  (defvar gdb-registers-mode-map