Mercurial > emacs
changeset 90198:97f6c3a96df1
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-66
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 446)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 24 Jun 2005 02:09:01 +0000 |
| parents | b7da78284d4c (current diff) cad79f2ac120 (diff) |
| children | bb71c6cf2009 |
| files | lisp/progmodes/gdb-ui.el lisp/progmodes/gud.el lispref/ChangeLog lispref/display.texi |
| diffstat | 4 files changed, 34 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/gdb-ui.el Fri Jun 24 01:59:52 2005 +0000 +++ b/lisp/progmodes/gdb-ui.el Fri Jun 24 02:09:01 2005 +0000 @@ -432,7 +432,7 @@ (setq gdb-var-changed t))) (if (re-search-forward "Undefined command" nil t) (message-box "Watching expressions requires gdb 6.0 onwards") - (message "No symbol %s in current context." expr))))) + (message "No symbol \"%s\" in current context." expr))))) (defun gdb-var-evaluate-expression-handler (varnum changed) (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer) @@ -776,6 +776,8 @@ (defun gdb-send (proc string) "A comint send filter for gdb. This filter may simply queue input for a later time." + (with-current-buffer gud-comint-buffer + (remove-text-properties (point-min) (point-max) '(face))) (let ((item (concat string "\n"))) (if gud-running (progn
--- a/lisp/progmodes/gud.el Fri Jun 24 01:59:52 2005 +0000 +++ b/lisp/progmodes/gud.el Fri Jun 24 02:09:01 2005 +0000 @@ -497,18 +497,24 @@ ;; Check for annotations and change gud-minor-mode to 'gdba if ;; they are found. (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc) - (when (string-equal (match-string 1 gud-marker-acc) "prompt") - (require 'gdb-ui) - (gdb-prompt nil)) - - (setq - ;; Append any text before the marker to the output we're going - ;; to return - we don't include the marker in this text. - output (concat output - (substring gud-marker-acc 0 (match-beginning 0))) - - ;; Set the accumulator to the remaining text. - gud-marker-acc (substring gud-marker-acc (match-end 0)))) + (let ((match (match-string 1 gud-marker-acc))) + (when (string-equal match "prompt") + (require 'gdb-ui) + (gdb-prompt nil)) + + (setq + ;; Append any text before the marker to the output we're going + ;; to return - we don't include the marker in this text. + output (concat output + (substring gud-marker-acc 0 (match-beginning 0))) + + ;; Set the accumulator to the remaining text. + + gud-marker-acc (substring gud-marker-acc (match-end 0))) + (if (string-equal match "error-begin") + (put-text-property 0 (length gud-marker-acc) + 'face font-lock-warning-face + gud-marker-acc)))) ;; Does the remaining text look like it might end with the ;; beginning of another marker? If it does, then keep it in @@ -3256,11 +3262,11 @@ (when gud-tooltip-dereference (setq expr (concat "*" expr))) (case gud-minor-mode - (gdba (concat "server print " expr)) - ((dbx gdbmi) (concat "print " expr)) - (xdb (concat "p " expr)) - (sdb (concat expr "/")) - (perldb expr))) + (gdba (concat "server print " expr)) + ((dbx gdbmi) (concat "print " expr)) + (xdb (concat "p " expr)) + (sdb (concat expr "/")) + (perldb expr))) (defun gud-tooltip-tips (event) "Show tip for identifier or selection under the mouse.
--- a/lispref/ChangeLog Fri Jun 24 01:59:52 2005 +0000 +++ b/lispref/ChangeLog Fri Jun 24 02:09:01 2005 +0000 @@ -1,3 +1,7 @@ +2005-06-23 Richard M. Stallman <rms@gnu.org> + + * display.texi (Face Functions): Correct Texinfo usage. + 2005-06-23 Luc Teirlinck <teirllm@auburn.edu> * lists.texi (Rings): `ring-elements' now returns the elements of
--- a/lispref/display.texi Fri Jun 24 01:59:52 2005 +0000 +++ b/lispref/display.texi Fri Jun 24 02:09:01 2005 +0000 @@ -2527,7 +2527,7 @@ A @dfn{face alias} provides an equivalent name for a face. You can define a face alias by giving the alias symbol the @code{face-alias} property, with a value of the target face name. The following example -makes @var{modeline} an alias for the @var{mode-line} face. +makes @code{modeline} an alias for the @code{mode-line} face. @example (put 'modeline 'face-alias 'mode-line) @@ -2873,9 +2873,9 @@ the @code{fringe} face, so normally @var{face} need only specify the foreground color for the bitmap. - These are the symbols identify the standard fringe bitmaps. -Evaluate @code{(require 'fringe)} to define them. Fringe bitmap -symbols have their own name space. + These symbols identify the standard fringe bitmaps. Evaluate +@code{(require 'fringe)} to define them. Fringe bitmap symbols have +their own name space. @table @asis @item Truncation and continuation line bitmaps: