Mercurial > emacs
comparison lisp/progmodes/gud.el @ 90225:a3716f7538f2
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 519-530)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 106-111)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 06 Sep 2005 00:25:20 +0000 |
parents | 2d92f5c9d6ae 88dc4b03facf |
children | fa0da9b57058 |
comparison
equal
deleted
inserted
replaced
90224:2d92f5c9d6ae | 90225:a3716f7538f2 |
---|---|
42 | 42 |
43 (eval-when-compile (require 'cl)) ; for case macro | 43 (eval-when-compile (require 'cl)) ; for case macro |
44 | 44 |
45 (require 'comint) | 45 (require 'comint) |
46 (require 'font-lock) | 46 (require 'font-lock) |
47 | |
48 (defvar gdb-active-process) | |
49 (defvar gdb-define-alist) | |
50 (defvar gdb-macro-info) | |
51 (defvar gdb-server-prefix) | |
52 (defvar gdb-show-changed-values) | |
53 (defvar gdb-var-changed) | |
54 (defvar gdb-var-list) | |
55 (defvar tool-bar-map) | |
47 | 56 |
48 ;; ====================================================================== | 57 ;; ====================================================================== |
49 ;; GUD commands must be visible in C buffers visited by GUD | 58 ;; GUD commands must be visible in C buffers visited by GUD |
50 | 59 |
51 (defgroup gud nil | 60 (defgroup gud nil |
506 (setq | 515 (setq |
507 ;; Append any text before the marker to the output we're going | 516 ;; Append any text before the marker to the output we're going |
508 ;; to return - we don't include the marker in this text. | 517 ;; to return - we don't include the marker in this text. |
509 output (concat output | 518 output (concat output |
510 (substring gud-marker-acc 0 (match-beginning 0))) | 519 (substring gud-marker-acc 0 (match-beginning 0))) |
511 | 520 |
512 ;; Set the accumulator to the remaining text. | 521 ;; Set the accumulator to the remaining text. |
513 | 522 |
514 gud-marker-acc (substring gud-marker-acc (match-end 0))) | 523 gud-marker-acc (substring gud-marker-acc (match-end 0))) |
515 (if (string-equal match "error-begin") | 524 (if (string-equal match "error-begin") |
516 (put-text-property 0 (length gud-marker-acc) | 525 (put-text-property 0 (length gud-marker-acc) |
517 'face font-lock-warning-face | 526 'face font-lock-warning-face |
518 gud-marker-acc)))) | 527 gud-marker-acc)))) |
2863 (defun gud-expr-compound-sep (span-start span-end) | 2872 (defun gud-expr-compound-sep (span-start span-end) |
2864 "Scan from SPAN-START to SPAN-END for punctuation characters. | 2873 "Scan from SPAN-START to SPAN-END for punctuation characters. |
2865 If `->' is found, return `?.'. If `.' is found, return `?.'. | 2874 If `->' is found, return `?.'. If `.' is found, return `?.'. |
2866 If any other punctuation is found, return `??'. | 2875 If any other punctuation is found, return `??'. |
2867 If no punctuation is found, return `? '." | 2876 If no punctuation is found, return `? '." |
2868 (let ((result ?\ ) | 2877 (let ((result ?\s) |
2869 (syntax)) | 2878 (syntax)) |
2870 (while (< span-start span-end) | 2879 (while (< span-start span-end) |
2871 (setq syntax (char-syntax (char-after span-start))) | 2880 (setq syntax (char-syntax (char-after span-start))) |
2872 (cond | 2881 (cond |
2873 ((= syntax ?\ ) t) | 2882 ((= syntax ?\s) t) |
2874 ((= syntax ?.) (setq syntax (char-after span-start)) | 2883 ((= syntax ?.) (setq syntax (char-after span-start)) |
2875 (cond | 2884 (cond |
2876 ((= syntax ?.) (setq result ?.)) | 2885 ((= syntax ?.) (setq result ?.)) |
2877 ((and (= syntax ?-) (= (char-after (+ span-start 1)) ?>)) | 2886 ((and (= syntax ?-) (= (char-after (+ span-start 1)) ?>)) |
2878 (setq result ?.) | 2887 (setq result ?.) |
2900 (setq syntax (gud-expr-compound-sep span-start span-end)) | 2909 (setq syntax (gud-expr-compound-sep span-start span-end)) |
2901 (cond | 2910 (cond |
2902 ((= (car first) (car second)) nil) | 2911 ((= (car first) (car second)) nil) |
2903 ((= (cdr first) (cdr second)) nil) | 2912 ((= (cdr first) (cdr second)) nil) |
2904 ((= syntax ?.) t) | 2913 ((= syntax ?.) t) |
2905 ((= syntax ?\ ) | 2914 ((= syntax ?\s) |
2906 (setq span-start (char-after (- span-start 1))) | 2915 (setq span-start (char-after (- span-start 1))) |
2907 (setq span-end (char-after span-end)) | 2916 (setq span-end (char-after span-end)) |
2908 (cond | 2917 (cond |
2909 ((= span-start ?)) t) | 2918 ((= span-start ?)) t) |
2910 ((= span-start ?]) t) | 2919 ((= span-start ?]) t) |