[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: |
Tue, 17 Jun 2008 22:09:41 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Nick Roberts <nickrob> 08/06/17 22:09:41
Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- gdb-ui.el 16 Jun 2008 11:26:22 -0000 1.249
+++ gdb-ui.el 17 Jun 2008 22:09:40 -0000 1.250
@@ -262,10 +262,8 @@
| Stack buffer | Breakpoints/threads buffer |
+-----------------------------------+----------------------------------+
-To run GDB in text command mode, replace the GDB \"--annotate=3\"
-option with \"--fullname\" either in the minibuffer for the
-current Emacs session, or the custom variable
-`gud-gdb-command-name' for all future sessions. You need to use
+The option \"--annotate=3\" must be included in this value. To
+run GDB in text command mode, use `gud-gdb'. You need to use
text command mode to debug multiple programs within one Emacs
session."
(interactive (list (gud-query-cmdline 'gdb)))
@@ -1666,15 +1664,12 @@
(let* ((annotation-type (match-string 1 annotation))
(annotation-arguments (match-string 2 annotation))
(annotation-rule (assoc annotation-type
- gdb-annotation-rules))
- (fullname (string-match gdb-fullname-regexp annotation-type)))
+ gdb-annotation-rules)))
;; Stuff prior to the match is just ordinary output.
;; It is either concatenated to OUTPUT or directed
;; elsewhere.
- (setq output
- (gdb-concat-output output
- (concat before (if fullname "\n"))))
+ (setq output (gdb-concat-output output before))
;; Take that stuff off the gud-marker-acc.
(setq gud-marker-acc after)
@@ -1682,19 +1677,7 @@
;; Call the handler for this annotation.
(if annotation-rule
(funcall (car (cdr annotation-rule))
- annotation-arguments)
-
- ;; Switch to gud-gdb-marker-filter if appropriate.
- (when fullname
-
- ;; Extract the frame position from the marker.
- (setq gud-last-frame (cons (match-string 1 annotation)
- (string-to-number
- (match-string 2 annotation))))
-
- (set (make-local-variable 'gud-minor-mode) 'gdb)
- (set (make-local-variable 'gud-marker-filter)
- 'gud-gdb-marker-filter)))
+ annotation-arguments))
;; Else the annotation is not recognized. Ignore it silently,
;; so that GDB can add new annotations without causing
@@ -3263,7 +3246,7 @@
(remove-hook 'after-save-hook 'gdb-create-define-alist t))
(defun gdb-source-info ()
- "Find the source file where the program starts and displays it with related
+ "Find the source file where the program starts and display it with related
buffers."
(goto-char (point-min))
(if (and (search-forward "Located in " nil t)