[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v
From: |
Nick Roberts |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v |
Date: |
Sun, 13 Aug 2006 01:09:12 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Nick Roberts <nickrob> 06/08/13 01:09:11
Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- gdb-ui.el 1 Aug 2006 23:16:00 -0000 1.179
+++ gdb-ui.el 13 Aug 2006 01:09:11 -0000 1.180
@@ -321,7 +321,7 @@
:version "22.1")
(defcustom gdb-use-separate-io-buffer nil
- "Non-nil means display output from the inferior in a separate buffer."
+ "Non-nil means display output from the debugged program in a separate
buffer."
:type 'boolean
:group 'gud
:version "22.1")
@@ -353,14 +353,14 @@
(error nil))))
(defun gdb-use-separate-io-buffer (arg)
- "Toggle separate IO for inferior.
+ "Toggle separate IO for debugged program.
With arg, use separate IO iff arg is positive."
(interactive "P")
(setq gdb-use-separate-io-buffer
(if (null arg)
(not gdb-use-separate-io-buffer)
(> (prefix-numeric-value arg) 0)))
- (message (format "Separate inferior IO %sabled"
+ (message (format "Separate IO %sabled"
(if gdb-use-separate-io-buffer "en" "dis")))
(if (and gud-comint-buffer
(buffer-name gud-comint-buffer))
@@ -1030,7 +1030,7 @@
(minibuffer . nil)))
(defun gdb-frame-separate-io-buffer ()
- "Display IO of inferior in a new frame."
+ "Display IO of debugged program in a new frame."
(interactive)
(if gdb-use-separate-io-buffer
(let ((special-display-regexps (append special-display-regexps '(".*")))
@@ -1776,9 +1776,8 @@
(goto-char (point-min))
(while (< (point) (- (point-max) 1))
(forward-line 1)
- (if (looking-at "[^\t].*?breakpoint")
+ (if (looking-at gdb-breakpoint-regexp)
(progn
- (looking-at "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)")
(setq bptno (match-string 1))
(setq flag (char-after (match-beginning 2)))
(add-text-properties
@@ -1786,8 +1785,9 @@
(if (eq flag ?y)
'(face font-lock-warning-face)
'(face font-lock-type-face)))
- (beginning-of-line)
- (if (re-search-forward " in \\(.*\\) at\\s-+" nil t)
+ (let ((bl (point))
+ (el (line-end-position)))
+ (if (re-search-forward " in \\(.*\\) at\\s-+" el t)
(progn
(add-text-properties
(match-beginning 1) (match-end 1)
@@ -1795,8 +1795,7 @@
(looking-at "\\(\\S-+\\):\\([0-9]+\\)")
(let ((line (match-string 2))
(file (match-string 1)))
- (add-text-properties (line-beginning-position)
- (line-end-position)
+ (add-text-properties bl el
'(mouse-face highlight
help-echo "mouse-2, RET: visit breakpoint"))
(unless (file-exists-p file)
@@ -1822,7 +1821,19 @@
(gdb-enqueue-input
(list (concat gdb-server-prefix "info source\n")
`(lambda () (gdb-get-location
- ,bptno ,line ,flag))))))))))
+ ,bptno ,line ,flag)))))))
+ (if (re-search-forward
+ "<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>"
+ el t)
+ (add-text-properties
+ (match-beginning 1) (match-end 1)
+ '(face font-lock-function-name-face))
+ (end-of-line)
+ (re-search-backward "\\s-\\(\\S-*\\)"
+ bl t)
+ (add-text-properties
+ (match-beginning 1) (match-end 1)
+ '(face font-lock-variable-name-face)))))))
(end-of-line))))))
(if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
@@ -2549,7 +2560,7 @@
'local-map
(gdb-make-header-line-mouse-map
'mouse-1
- #'(lambda () (interactive)
+ (lambda () (interactive)
(let ((gdb-memory-address
;; Let GDB do the arithmetic.
(concat
@@ -2568,7 +2579,7 @@
'mouse-face 'mode-line-highlight
'local-map (gdb-make-header-line-mouse-map
'mouse-1
- #'(lambda () (interactive)
+ (lambda () (interactive)
(let ((gdb-memory-address nil))
(gdb-invalidate-memory)))))
"]: "
@@ -2635,10 +2646,10 @@
(defvar gdb-locals-watch-map
(let ((map (make-sparse-keymap)))
- (define-key map "\r" '(lambda () (interactive)
+ (define-key map "\r" (lambda () (interactive)
(beginning-of-line)
(gud-watch)))
- (define-key map [mouse-2] '(lambda (event) (interactive "e")
+ (define-key map [mouse-2] (lambda (event) (interactive "e")
(mouse-set-point event)
(beginning-of-line)
(gud-watch)))
@@ -2764,7 +2775,7 @@
(define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
(define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
(define-key menu [inferior]
- '(menu-item "Inferior IO" gdb-display-separate-io-buffer
+ '(menu-item "Separate IO" gdb-display-separate-io-buffer
:enable gdb-use-separate-io-buffer))
(define-key menu [memory] '("Memory" . gdb-display-memory-buffer))
(define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
@@ -2783,7 +2794,7 @@
(define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
(define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
(define-key menu [inferior]
- '(menu-item "Inferior IO" gdb-frame-separate-io-buffer
+ '(menu-item "Separate IO" gdb-frame-separate-io-buffer
:enable gdb-use-separate-io-buffer))
(define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
(define-key menu [disassembly] '("Disassembly" . gdb-frame-assembler-buffer))
@@ -2802,9 +2813,9 @@
:help "Toggle look for source frame."
:button (:toggle . gdb-find-source-frame)))
(define-key menu [gdb-use-separate-io]
- '(menu-item "Separate Inferior IO" gdb-use-separate-io-buffer
+ '(menu-item "Separate IO" gdb-use-separate-io-buffer
:visible (eq gud-minor-mode 'gdba)
- :help "Toggle separate IO for inferior."
+ :help "Toggle separate IO for debugged program."
:button (:toggle . gdb-use-separate-io-buffer)))
(define-key menu [gdb-many-windows]
'(menu-item "Display Other Windows" gdb-many-windows
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Nick Roberts, 2006/08/01
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v,
Nick Roberts <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Nick Roberts, 2006/08/14
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Nick Roberts, 2006/08/17
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Romain Francoise, 2006/08/17
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Nick Roberts, 2006/08/21
- [Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v, Nick Roberts, 2006/08/22