(texinfo-font-lock-keywords): Add

fontification for @value, @dfn, @dmn, @acronym, @anchor, and
@inforef.  Add an OVERRIDE of `keep' to highlight specs of
keywords whose arguments routinely include @@.

2 files changed, 18 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 361f7af8b59..9e7c4fbe93a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * textmodes/texinfo.el (texinfo-font-lock-keywords): Add
+        fontification for @value, @dfn, @dmn, @acronym, @anchor, and
+        @inforef.  Add an OVERRIDE of `keep' to highlight specs of
+        keywords whose arguments routinely include @@.
+
 2001-04-10  Gerd Moellmann  <gerd@gnu.org>
 
         * emacs-lisp/advice.el (ad-make-advised-definition): Construct
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 1dcae0b1d40..fdd6faea848 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -323,10 +323,18 @@ chapter."
     ("@\\([a-zA-Z]+\\|[^ \t\n]\\)" 1 font-lock-keyword-face) ;commands
     ("^\\*\\(.*\\)[\t ]*$" 1 font-lock-function-name-face t) ;menu items
     ("@\\(emph\\|strong\\|b\\|i\\|sc\\){\\([^}]+\\)" 2 font-lock-comment-face)
-    ("@\\(file\\|kbd\\|key\\|url\\|uref\\|email\\){\\([^}]+\\)" 2 font-lock-string-face)
+    ("@\\(kbd\\|key\\|url\\|uref\\){\\([^}]+\\)"
+     2 font-lock-string-face)
+    ;; The following two groups have an OVERRIDE of `keep' because
+    ;; their arguments frequently include a @@, and we don't want that
+    ;; to overwrite the normal fontification of the argument.
+    ("@\\(file\\|email\\){\\([^}]+\\)" 2 font-lock-string-face keep)
     ("@\\(samp\\|code\\|var\\|math\\|env\\|command\\|option\\){\\([^}]+\\)"
-     2 font-lock-variable-name-face)
-    ("@\\(cite\\|[ux]?ref\\|pxref\\){\\([^}]+\\)" 2 font-lock-constant-face)
+     2 font-lock-variable-name-face keep)
+    ("@\\(cite\\|x?ref\\|pxref\\|dfn\\|inforef\\){\\([^}]+\\)"
+     2 font-lock-constant-face)
+    ("@\\(anchor\\){\\([^}]+\\)" 2 font-lock-type-face)
+    ("@\\(dmn\\|acronym\\|value\\){\\([^}]+\\)" 2 font-lock-builtin-face)
     ("@\\(end\\|itemx?\\) +\\(.+\\)" 2 font-lock-function-name-face keep)
     (,(concat "^@" (regexp-opt (mapcar 'car texinfo-section-list) t)
                ".*\n") 0 texinfo-heading-face t))