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

[Ralf Angeli]

Index: auctex/latex.el
diff -u auctex/latex.el:5.369 auctex/latex.el:5.370
--- auctex/latex.el:5.369       Sat May 14 17:01:06 2005
+++ auctex/latex.el     Sat May 14 19:00:58 2005
@@ -4520,10 +4520,6 @@
   (or LaTeX-largest-level
       (setq LaTeX-largest-level (LaTeX-section-level "section")))
 
-  (use-local-map LaTeX-mode-map)
-  (easy-menu-add LaTeX-mode-menu LaTeX-mode-map)
-  (easy-menu-add LaTeX-mode-command-menu LaTeX-mode-map)
-
   (setq TeX-header-end LaTeX-header-end
        TeX-trailer-start LaTeX-trailer-start)
 
@@ -4881,7 +4877,15 @@
 ;; user overrode it.
 
   (set (make-local-variable 'imenu-create-index-function)
-       'LaTeX-imenu-create-index-function))
+       'LaTeX-imenu-create-index-function)
+
+  (use-local-map LaTeX-mode-map)
+  ;; Calling `easy-menu-add' may result in the menu filters being
+  ;; executed which call `TeX-update-style'.  So this is placed very
+  ;; late in mode initialization to assure that all relevant variables
+  ;; are properly initialized before style files try to alter them.
+  (easy-menu-add LaTeX-mode-menu LaTeX-mode-map)
+  (easy-menu-add LaTeX-mode-command-menu LaTeX-mode-map))
 
 (defun LaTeX-imenu-create-index-function ()
   "Imenu support function for LaTeX."