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

[Ralf Angeli]

Index: auctex/font-latex.el
diff -u auctex/font-latex.el:5.138 auctex/font-latex.el:5.139
--- auctex/font-latex.el:5.138  Sat Sep 10 08:48:23 2005
+++ auctex/font-latex.el        Sat Sep 10 09:38:17 2005
@@ -385,9 +385,7 @@
               ,(concat "Fontify `" prefix name "' up to LIMIT.
 
 Generated by `font-latex-make-match-defun'.")
-              (when (and ,(intern (concat prefix name))
-                         (or ,(intern (concat prefix name "-keywords"))
-                             ,(intern (concat prefix name "-keywords-local"))))
+              (when ,(intern (concat prefix name))
                 (font-latex-match-command-with-arguments
                  ,(intern (concat prefix name)) limit
                  ,(nth 1 type) ,(nth 2 type)))))
@@ -488,17 +486,18 @@
                   (if (string-match "^[A-Za-z]" elt)
                       (add-to-list 'multi-char-macros elt)
                     (add-to-list 'single-char-macros elt)))
-                (setq ,(intern (concat prefix name))
-                      (concat
-                       "\\\\\\("
-                       (when (> (safe-length multi-char-macros) 0)
-                         (concat
-                          "\\(?:" (regexp-opt multi-char-macros) "\\)\\>"))
-                       (when (> (safe-length single-char-macros) 0)
-                         (concat
-                          (when (> (safe-length multi-char-macros) 0) "\\|")
-                          "\\(?:" (regexp-opt single-char-macros) "\\)"))
-                       "\\)")))))
+                (when (or multi-char-macros single-char-macros)
+                  (setq ,(intern (concat prefix name))
+                        (concat
+                         "\\\\\\("
+                         (when multi-char-macros
+                           (concat
+                            "\\(?:" (regexp-opt multi-char-macros) "\\)\\>"))
+                         (when single-char-macros
+                           (concat
+                            (when multi-char-macros "\\|")
+                            "\\(?:" (regexp-opt single-char-macros) "\\)"))
+                         "\\)"))))))
 
       ;; defcustom font-latex-match-*-keywords
       (eval `(defcustom ,(intern (concat prefix name "-keywords")) nil