Small gud.el patch

Small gud.el patch

[David Hansen]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

Hello,

this patch fixes two problems:

1. Wrong coloring of the 'd' in 'end' (syntactic keywords
   gave the 'd' comment end syntax).

2. "end" after a "document" is now colored as a keyword.

David


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gud.diff --]
[-- Type: text/x-patch, Size: 844 bytes --]

--- /home/dhansen/cvs-src/emacs/lisp/progmodes/gud.el	2006-07-20 23:23:10.000000000 +0200
+++ gud.el	2006-08-03 17:18:52.000000000 +0200
@@ -3175,12 +3175,12 @@
     ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face))
     ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face))))
 
-;; FIXME: The keyword "end" associated with "document"
-;; should have font-lock-keyword-face (currently font-lock-doc-face).
+(defun gdb-script-font-lock-end-of-document (limit)
+  (re-search-forward "\\(\n\\)end\\>" limit t))
+
 (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"))))
+    (gdb-script-font-lock-end-of-document (1 "> b"))))
 
 (defun gdb-script-font-lock-syntactic-face (state)
   (cond

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: Small gud.el patch

[Stefan Monnier]

> 1. Wrong coloring of the 'd' in 'end' (syntactic keywords
>    gave the 'd' comment end syntax).

> 2. "end" after a "document" is now colored as a keyword.

IIRC an earlier version of the code did exactly what your patch does.
The problem is that the \n you modify belongs to the previous line, so
you're now dealing with a multiline keyword here.

This causes problems for example if you go and modify the line just before
the "end": the refontification of that line will remove the annotation on
the \n.

I've installed the patch below instead,


        Stefan


Index: lisp/progmodes/gud.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gud.el,v
retrieving revision 1.114
diff -u -r1.114 gud.el
--- lisp/progmodes/gud.el	13 Jul 2006 21:57:05 -0000	1.114
+++ lisp/progmodes/gud.el	3 Aug 2006 18:29:22 -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