Mercurial > emacs
changeset 96054:cc30416c6de7
(gud-gdba-marker-filter): Don't switch to
text command mode.
(gdb): Explain that gud-gdb is needed for text command mode.
| author | Nick Roberts <nickrob@snap.net.nz> |
|---|---|
| date | Tue, 17 Jun 2008 22:09:40 +0000 |
| parents | 6b1a9151a2c9 |
| children | d37c900369a0 |
| files | lisp/progmodes/gdb-ui.el |
| diffstat | 1 files changed, 6 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/gdb-ui.el Tue Jun 17 22:08:57 2008 +0000 +++ b/lisp/progmodes/gdb-ui.el Tue Jun 17 22:09:40 2008 +0000 @@ -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)