Mercurial > emacs
changeset 72257:93223615e952
(gdb-script-font-lock-syntactic-keywords):
Correctly mark the end-of-docstring char.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 03 Aug 2006 18:30:13 +0000 |
| parents | 2eb34581dbad |
| children | 80f088e3c26d |
| files | lisp/ChangeLog lisp/progmodes/gud.el |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Aug 03 18:27:50 2006 +0000 +++ b/lisp/ChangeLog Thu Aug 03 18:30:13 2006 +0000 @@ -1,3 +1,8 @@ +2006-08-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/gud.el (gdb-script-font-lock-syntactic-keywords): + Correctly mark the end-of-docstring char. + 2006-08-03 Chong Yidong <cyd@stupidchicken.com> * simple.el (line-move-to-column): Constrain move-to-column to @@ -180,8 +185,13 @@ * tumme.el (tumme-backward-image): Add prefix argument. Add error when at first image. +<<<<<<< ChangeLog + (tumme-forward-image): Add prefix argument. + Add error when at last image. +======= (tumme-forward-image): Add prefix argument. Add error when at last image. +>>>>>>> 1.9899 2006-07-25 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/lisp/progmodes/gud.el Thu Aug 03 18:27:50 2006 +0000 +++ b/lisp/progmodes/gud.el Thu Aug 03 18:30:13 2006 +0000 @@ -3180,7 +3180,15 @@ (defvar gdb-script-font-lock-syntactic-keywords '(("^document\\s-.*\\(\n\\)" (1 "< b")) ;; It would be best to change the \n in front, but it's more difficult. - ("^en\\(d\\)\\>" (1 "> b")))) + ("^end\\>" + (0 (progn + (unless (eq (match-beginning 0) (point-min)) + (put-text-property (1- (match-beginning 0)) (match-beginning 0) + 'syntax-table (eval-when-compile + (string-to-syntax "> b"))) + (put-text-property (1- (match-beginning 0)) (match-end 0) + 'font-lock-multiline t) + nil)))))) (defun gdb-script-font-lock-syntactic-face (state) (cond