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

[Ralf Angeli]

Index: auctex/font-latex.el
diff -u auctex/font-latex.el:5.119 auctex/font-latex.el:5.120
--- auctex/font-latex.el:5.119  Thu May 12 14:15:23 2005
+++ auctex/font-latex.el        Tue May 24 14:38:00 2005
@@ -361,6 +361,7 @@
 This is a helper function for `font-latex-make-built-in-keywords'
 and `font-latex-make-user-keywords' and not intended for general
 use."
+  ;; Note: The functions are byte-compiled at the end of font-latex.el.
   ;; FIXME: Is the if-clause possible inside of the defun?
   (if (listp type) ; 'command and 'title are treated likewise
       (eval `(defun ,(intern (concat prefix name)) (limit)
@@ -386,9 +387,7 @@
 Generated by `font-latex-make-match-defun'.")
                    (when ,(intern (concat prefix name))
                      (re-search-forward
-                      ,(intern (concat prefix name)) limit t)))))))
-  (when (byte-code-function-p (symbol-function 'font-latex-make-match-defun))
-    (byte-compile (intern (concat prefix name)))))
+                      ,(intern (concat prefix name)) limit t))))))))
 
 (defun font-latex-keyword-matcher (prefix name face type)
   "Return a matcher and highlighter as required by `font-lock-keywords'.
@@ -455,6 +454,7 @@
                ',(intern (concat prefix name "-keywords-local"))))
 
        ;; defun font-latex-match-*-make
+       ;; Note: The functions are byte-compiled at the end of font-latex.el.
        (eval `(defun ,(intern (concat prefix name "-make")) ()
                 ,(concat "Make or remake the variable `" prefix name "'.
 
@@ -512,12 +512,7 @@
                       keywords-entry t)
          (when (= level 1)
            (add-to-list (intern (concat "font-latex-keywords-2"))
-                        keywords-entry t)))
-
-       ;; Compile font-latex-match-*-make
-       (when (byte-code-function-p (symbol-function
-                                    'font-latex-make-built-in-keywords))
-         (byte-compile (intern (concat prefix name "-make"))))))))
+                        keywords-entry t)))))))
 (font-latex-make-built-in-keywords)
 
 (defcustom font-latex-user-keyword-classes nil
@@ -1559,6 +1554,17 @@
 (if (eq major-mode 'latex-mode)
     (font-latex-setup))
 
+
+;;; Byte-compilation of generated functions
+
+(when (byte-code-function-p
+       (symbol-function 'font-latex-make-built-in-keywords))
+  (dolist (elt font-latex-built-in-keyword-classes)
+    (let ((name (nth 0 elt)))
+      (byte-compile (intern (concat "font-latex-" name)))
+      (byte-compile (intern (concat "font-latex-" name "-make"))))))
+
+
 ;; Provide ourselves:
 (provide 'font-latex)