(gdb-script-font-lock-syntactic-keywords):

Correctly mark the end-of-docstring char.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6ca6734af490c746f4a5cc177c09cfe3f3077bc..1f6e469dd629437a1fa10d71f9b117b1eafd932f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 97e54135a6f0ba7fdcbd0d45aab36c565d9d49ee..84b40e8ba8030acfd002d2151da86de854235b10 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3180,7 +3180,15 @@ class of the file (using s to separate nested class ids)."
 (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