[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.67 emacs/lisp/progmodes/gdb-ui.el:1.68
*** emacs/lisp/progmodes/gdb-ui.el:1.67 Mon May  9 21:54:47 2005
--- emacs/lisp/progmodes/gdb-ui.el      Sun May 22 12:37:24 2005
***************
*** 1303,1309 ****
                      (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"))
                        (unless (file-exists-p file)
--- 1303,1310 ----
                      (looking-at "\\(\\S-+\\):\\([0-9]+\\)")
                      (let ((line (match-string 2)) (buffer-read-only nil)
                            (file (match-string 1)))
!                       (add-text-properties (line-beginning-position)
!                                            (line-end-position)
                         '(mouse-face highlight
                           help-echo "mouse-2, RET: visit breakpoint"))
                        (unless (file-exists-p file)
***************
*** 1504,1516 ****
        (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)
          (when (and (looking-at "^#\\([0-9]+\\)")
                     (equal (match-string 1) gdb-current-stack-level))
!           (put-text-property (point-at-bol) (point-at-eol)
                               'face '(:inverse-video t)))
          (forward-line 1))))))
  
--- 1505,1517 ----
        (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 frame"))
          (beginning-of-line)
          (when (and (looking-at "^#\\([0-9]+\\)")
                     (equal (match-string 1) gdb-current-stack-level))
!           (put-text-property (line-beginning-position) (line-end-position)
                               'face '(:inverse-video t)))
          (forward-line 1))))))
  
***************
*** 1588,1594 ****
      (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)))))
--- 1589,1595 ----
      (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)))))
***************
*** 1974,1987 ****
    (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
      (with-current-buffer buf
        (goto-char (point-min))
!       (while (re-search-forward "^ .*\n" nil t)
        (replace-match "" nil nil))
        (goto-char (point-min))
!       (while (re-search-forward "{[-0-9, {}\]*\n" nil t)
!       (replace-match "(array);\n" nil nil))
        (goto-char (point-min))
!       (while (re-search-forward "{.*=.*\n" nil t)
!       (replace-match "(structure);\n" nil nil))))
    (let ((buf (gdb-get-buffer 'gdb-locals-buffer)))
      (and buf (with-current-buffer buf
               (let ((p (point))
--- 1975,1988 ----
    (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
      (with-current-buffer buf
        (goto-char (point-min))
!       (while (re-search-forward "^[ }].*\n" nil t)
        (replace-match "" nil nil))
        (goto-char (point-min))
!       (while (re-search-forward "{\\(.*=.*\n\\|\n\\)" nil t)
!       (replace-match "(structure);\n" nil nil))
        (goto-char (point-min))
!       (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 (point))
***************
*** 2316,2323 ****
          (delete-overlay overlay))))
  
  (defun gdb-put-breakpoint-icon (enabled bptno)
!   (let ((start (progn (beginning-of-line) (- (point) 1)))
!       (end (progn (end-of-line) (+ (point) 1)))
        (putstring (if enabled "B" "b")))
      (add-text-properties
       0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")
--- 2317,2324 ----
          (delete-overlay overlay))))
  
  (defun gdb-put-breakpoint-icon (enabled bptno)
!   (let ((start (- (line-beginning-position) 1))
!       (end (+ (line-end-position) 1))
        (putstring (if enabled "B" "b")))
      (add-text-properties
       0 1 '(help-echo "mouse-1: set/clear bkpt, mouse-3: enable/disable bkpt")