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

[Nick Roberts]

Index: emacs/lisp/gdb-ui.el
diff -c emacs/lisp/gdb-ui.el:1.39 emacs/lisp/gdb-ui.el:1.40
*** emacs/lisp/gdb-ui.el:1.39   Mon Jul 28 15:49:30 2003
--- emacs/lisp/gdb-ui.el        Mon Aug 11 17:55:20 2003
***************
*** 817,823 ****
    (setq gdb-display-in-progress nil))
  
  (define-button-type 'gdb-display-back
!   'help-echo (purecopy "mouse-2, RET: go back to previous display buffer")
    'action (lambda (button) (gdb-display-go-back)))
  
  (defun gdb-display-go-back ()
--- 817,823 ----
    (setq gdb-display-in-progress nil))
  
  (define-button-type 'gdb-display-back
!   'help-echo "mouse-2, RET: go back to previous display buffer"
    'action (lambda (button) (gdb-display-go-back)))
  
  (defun gdb-display-go-back ()
***************
*** 945,954 ****
        (insert-buffer-substring (gdb-get-buffer
                                  'gdb-partial-output-buffer)
                                 start end)
!       (put-text-property (- (point) (- end start)) (- (point) 1)
!                          'mouse-face 'highlight)
!       (put-text-property (- (point) (- end start)) (- (point) 1)
!                          'local-map gdb-dive-map)))
      (delete-region start end)))
  
  (defvar gdb-values nil)
--- 945,952 ----
        (insert-buffer-substring (gdb-get-buffer
                                  'gdb-partial-output-buffer)
                                 start end)
!       (add-text-properties (- (point) (- end start)) (- (point) 1)
!                            `(mouse-face highlight local-map ,gdb-dive-map))))
      (delete-region start end)))
  
  (defvar gdb-values nil)
***************
*** 1060,1071 ****
          (setq array-stop (int-to-string (aref gdb-array-stop num)))
          (setq array-range (concat "[" array-start
                                    ":" array-stop "]"))
!         (put-text-property 1 (+ (length array-start)
!                                 (length array-stop) 2)
!                            'mouse-face 'highlight array-range)
!         (put-text-property 1 (+ (length array-start)
!                                 (length array-stop) 2)
!                            'local-map gdb-array-slice-map array-range)
          (goto-char (point-min))
          (setq array-slice (concat array-slice array-range))
          (setq num (+ num 1)))
--- 1058,1068 ----
          (setq array-stop (int-to-string (aref gdb-array-stop num)))
          (setq array-range (concat "[" array-start
                                    ":" array-stop "]"))
!         (add-text-properties 
!          1 (+ (length array-start) (length array-stop) 2)
!          `(mouse-face highlight
!            local-map ,gdb-array-slice-map
!            help-echo "mouse-2, RET: select slice for this index") array-range)
          (goto-char (point-min))
          (setq array-slice (concat array-slice array-range))
          (setq num (+ num 1)))
***************
*** 1342,1348 ****
        (with-current-buffer buffer
        (if (and (eq gud-minor-mode 'gdba)
                 (not (string-match "^\*" (buffer-name))))
!           (if (eq window-system 'x)
                (remove-images (point-min) (point-max))
              (gdb-remove-strings (point-min) (point-max))))))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
--- 1339,1345 ----
        (with-current-buffer buffer
        (if (and (eq gud-minor-mode 'gdba)
                 (not (string-match "^\*" (buffer-name))))
!           (if (display-images-p)
                (remove-images (point-min) (point-max))
              (gdb-remove-strings (point-min) (point-max))))))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
***************
*** 1360,1368 ****
                      (looking-at "\\(\\S-*\\):\\([0-9]+\\)")
                      (let ((line (match-string 2)) (buffer-read-only nil)
                            (file (match-string 1)))
!                       (put-text-property (progn (beginning-of-line) (point))
!                                          (progn (end-of-line) (point))
!                                          'mouse-face 'highlight)
                        (with-current-buffer
                            (find-file-noselect
                             (if (file-exists-p file) file
--- 1357,1365 ----
                      (looking-at "\\(\\S-*\\):\\([0-9]+\\)")
                      (let ((line (match-string 2)) (buffer-read-only nil)
                            (file (match-string 1)))
!                       (add-text-properties (point-at-bol) (point-at-eol)
!                        '(mouse-face highlight
!                          help-echo "mouse-2, RET: visit breakpoint"))
                        (with-current-buffer
                            (find-file-noselect
                             (if (file-exists-p file) file
***************
*** 1383,1389 ****
                            (let ((start (progn (beginning-of-line)
                                                (- (point) 1)))
                                  (end (progn (end-of-line) (+ (point) 1))))
!                             (if (eq window-system 'x)
                                  (progn
                                    (remove-images start end)
                                    (if (eq ?y flag)
--- 1380,1386 ----
                            (let ((start (progn (beginning-of-line)
                                                (- (point) 1)))
                                  (end (progn (end-of-line) (+ (point) 1))))
!                             (if (display-images-p)
                                  (progn
                                    (remove-images start end)
                                    (if (eq ?y flag)
***************
*** 1544,1561 ****
        (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!         (put-text-property (progn (beginning-of-line) (point))
!                            (progn (end-of-line) (point))
!                            'mouse-face 'highlight)
          (beginning-of-line)
          (if (or (looking-at "^#[0-9]*\\s-*\\S-* in \\(\\S-*\\)")
                  (looking-at "^#[0-9]*\\s-*\\(\\S-*\\)"))
              (if (equal (match-string 1) gdb-current-frame)
!                 (put-text-property (progn (beginning-of-line) (point))
!                                    (progn (end-of-line) (point))
!                                    'face 
!                                    `(:background ,(face-attribute 'default 
:foreground)
!                                      :foreground ,(face-attribute 'default 
:background)))))
          (forward-line 1))))))
  
  (defun gdb-stack-buffer-name ()
--- 1541,1557 ----
        (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!         (add-text-properties (point-at-bol) (point-at-eol)
!                            '(mouse-face highlight
!                              help-echo "mouse-2, RET: Select frame"))
          (beginning-of-line)
          (if (or (looking-at "^#[0-9]*\\s-*\\S-* in \\(\\S-*\\)")
                  (looking-at "^#[0-9]*\\s-*\\(\\S-*\\)"))
              (if (equal (match-string 1) gdb-current-frame)
!                 (put-text-property (point-at-bol) (point-at-eol)
!                  'face 
!                  `(:background ,(face-attribute 'default :foreground)
!                    :foreground ,(face-attribute 'default :background)))))
          (forward-line 1))))))
  
  (defun gdb-stack-buffer-name ()
***************
*** 1629,1637 ****
      (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!       (put-text-property (progn (beginning-of-line) (point))
!                          (progn (end-of-line) (point))
!                          'mouse-face 'highlight)
        (forward-line 1)))))
  
  (defun gdb-threads-buffer-name ()
--- 1625,1633 ----
      (let ((buffer-read-only nil))
        (goto-char (point-min))
        (while (< (point) (point-max))
!       (add-text-properties (point-at-bol) (point-at-eol)
!                            '(mouse-face highlight
!                              help-echo "mouse-2, RET: select thread"))
        (forward-line 1)))))
  
  (defun gdb-threads-buffer-name ()
***************
*** 2160,2166 ****
          (if (eq gud-minor-mode 'gdba)
              (if (string-match "^\*.+*$" (buffer-name))
                  (kill-buffer nil)
!               (if (eq window-system 'x)
                    (remove-images (point-min) (point-max))
                  (gdb-remove-strings (point-min) (point-max)))
                (setq left-margin-width 0)
--- 2156,2162 ----
          (if (eq gud-minor-mode 'gdba)
              (if (string-match "^\*.+*$" (buffer-name))
                  (kill-buffer nil)
!               (if (display-images-p)
                    (remove-images (point-min) (point-max))
                  (gdb-remove-strings (point-min) (point-max)))
                (setq left-margin-width 0)
***************
*** 2323,2329 ****
                  (setq gdb-arrow-position (point))
                  (gdb-put-arrow "=>" (point))))))
        ;; remove all breakpoint-icons in assembler buffer before updating.
!       (if (eq window-system 'x)
          (remove-images (point-min) (point-max))
        (gdb-remove-strings (point-min) (point-max))))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
--- 2319,2325 ----
                  (setq gdb-arrow-position (point))
                  (gdb-put-arrow "=>" (point))))))
        ;; remove all breakpoint-icons in assembler buffer before updating.
!       (if (display-images-p)
          (remove-images (point-min) (point-max))
        (gdb-remove-strings (point-min) (point-max))))
      (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer)
***************
*** 2344,2350 ****
                  (if (re-search-forward address nil t)
                      (let ((start (progn (beginning-of-line) (- (point) 1)))
                            (end (progn (end-of-line) (+ (point) 1))))
!                       (if (eq window-system 'x)
                            (progn
                              (remove-images start end)
                              (if (eq ?y flag)
--- 2340,2346 ----
                  (if (re-search-forward address nil t)
                      (let ((start (progn (beginning-of-line) (- (point) 1)))
                            (end (progn (end-of-line) (+ (point) 1))))
!                       (if (display-images-p)
                            (progn
                              (remove-images start end)
                              (if (eq ?y flag)