[AUCTeX-diffs] Changes to auctex/font-latex.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    08/06/07 18:11:54

Index: font-latex.el
===================================================================
RCS file: /cvsroot/auctex/auctex/font-latex.el,v
retrieving revision 5.185
retrieving revision 5.186
diff -u -b -r5.185 -r5.186
--- font-latex.el       25 May 2008 06:50:31 -0000      5.185
+++ font-latex.el       7 Jun 2008 18:11:53 -0000       5.186
@@ -535,16 +535,15 @@
               ',keywords
               ,(concat "Buffer-local keywords to add to `"
                        prefix name "-keywords'.
-This must be a list of keyword strings \(not regular expressions\) omitting
-the leading backslash.  It will get transformed into a regexp using
-`" prefix name "-make'.  This variable is not for end users; they
-should customize `" prefix name "-keywords' instead.  It is for
-authors of Lisp files that get loaded when LaTeX style files are used in the
-current buffer.  They should add keywords to this list and rebuild the
-fontification regexp like so:
 
- (add-to-list '" prefix name "-keywords-local \"setstuff\")
- (" prefix name "-make)
+This must be a list where each element is a list consisting of a
+keyword string \(not a regular expression\) omitting the leading
+backslash and a format specifier as.  The options for the format
+specifier are described in the doc string of
+`font-latex-user-keyword-classes'.
+
+This is an internal variable which should not be set directly.
+Use `font-latex-add-keywords' instead.
 
 Generated by `font-latex-make-built-in-keywords'.")))
       (eval `(make-variable-buffer-local
@@ -583,15 +582,27 @@
 
       ;; defcustom font-latex-match-*-keywords
       (eval `(defcustom ,(intern (concat prefix name "-keywords")) nil
-              ,(concat "List of keyword strings for " name " face.
-Each string has to be the name of a macro omitting the leading backslash.
-
-Setting this variable directly does not take effect;
-restart Emacs.
+              ,(concat "List of keywords "
+                       (when (eq type 'command) "and formats ")
+                       "for " name " face.\n"
+                       (if (eq type 'command)
+                           "\
+Each element has to be a list consisting of the name of a macro
+omitting the leading backslash and a format specifier as
+described in the doc string of `font-latex-user-keyword-classes'."
+                         "\
+Each element has to be the name of a macro as a string, omitting
+the leading backslash.")
+                       "\n\n\
+Setting this variable directly does not take effect; restart
+Emacs.
 
 Generated by `font-latex-make-built-in-keywords'.")
-              :type '(repeat (list (string :tag "Keyword")
-                                   (string :tag "Format")))
+              :type '(repeat (string :tag "Keyword"))
+              :type '(repeat ,(if (eq type 'command)
+                                  '(list (string :tag "Keyword")
+                                         (string :tag "Format"))
+                                '(string :tag "Keyword")))
               :set (lambda (symbol value)
                      (set-default symbol value)
                      (funcall ',(intern (concat prefix name "-make"))))