[elpa] externals/auctex f4c5af9 37/78: Fix loading of polyglossia language style files.

[Tassilo Horn]

branch: externals/auctex
commit f4c5af9a2bfb64fc62a6319c903f7a96dc9052a8
Author: Mosè Giordano <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Fix loading of polyglossia language style files.
    
    * style/polyglossia.el (LaTeX-polyglossia-prepare): Clear
    `LaTeX-polyglossia-lang-list'.
    (LaTeX-polyglossia-cleanup): Remove clearing of
    `LaTeX-polyglossia-lang-list'.
    (TeX-update-style-hook): Append
    `LaTeX-polyglossia-load-languages'.
    ("polyglossia"): Remove `LaTeX-polyglossia-load-languages' from
    here.
---
 ChangeLog            |   11 +++++++++++
 style/polyglossia.el |   13 ++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e474fe..71f2b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-09-10  Mos� Giordano  <address@hidden>
+
+       * style/polyglossia.el (LaTeX-polyglossia-prepare): Clear
+       `LaTeX-polyglossia-lang-list'.
+       (LaTeX-polyglossia-cleanup): Remove clearing of
+       `LaTeX-polyglossia-lang-list'.
+       (TeX-update-style-hook): Append
+       `LaTeX-polyglossia-load-languages'.
+       ("polyglossia"): Remove `LaTeX-polyglossia-load-languages' from
+       here.
+
 2015-09-09  Mos� Giordano  <address@hidden>
 
        * style/polyglossia.el: Remove
diff --git a/style/polyglossia.el b/style/polyglossia.el
index 1254f28..86d0add 100644
--- a/style/polyglossia.el
+++ b/style/polyglossia.el
@@ -59,9 +59,10 @@
   "Temporary for parsing polyglossia language options.")
 
 (defun LaTeX-polyglossia-prepare ()
-  "Clear `LaTex-auto-polyglossia-lang' before use."
+  "Clear some polyglossia variables before use."
   (setq LaTeX-auto-polyglossia-lang nil
-       LaTeX-auto-polyglossia-setkeys nil))
+       LaTeX-auto-polyglossia-setkeys nil
+       LaTeX-polyglossia-lang-list nil))
 
 (defun LaTeX-polyglossia-cleanup ()
   "Move languages and their options from
@@ -84,7 +85,6 @@
   ;; the polyglossia command which set the language, the rest of values is the
   ;; list of options given to the language.
   (let (opts otheropts)
-    (setq LaTeX-polyglossia-lang-list nil)
     (mapc
      (lambda (elt)
        (mapc
@@ -109,6 +109,9 @@
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-polyglossia-prepare)
 (add-hook 'TeX-auto-cleanup-hook #'LaTeX-polyglossia-cleanup)
 (add-hook 'TeX-update-style-hook #'TeX-auto-parse t)
+;; Run style hooks for every active language.  This *has* to be done after
+;; `TeX-auto-parse'.
+(add-hook 'TeX-update-style-hook #'LaTeX-polyglossia-load-languages t)
 
 (defvar LaTeX-polyglossia-language-list
   '("albanian" "amharic" "arabic" "armenian" "asturian" "bahasai" "bahasam"
@@ -230,10 +233,6 @@ argument, otherwise as a mandatory one."
     `(,LaTeX-polyglossia-lang-regexp (3 1 2) LaTeX-auto-polyglossia-lang))
    (TeX-auto-add-regexp
     `(,LaTeX-polyglossia-setkeys-regexp (1 2) LaTeX-auto-polyglossia-setkeys))
-   ;; Run style hooks for every active language.  FIXME: actually
-   ;; `LaTeX-polyglossia-active-languages' returns nil here, so no style hook 
is
-   ;; automatically loaded.
-   (LaTeX-polyglossia-load-languages)
    (TeX-run-style-hooks "etoolbox" "makecmds" "xkeyval" "fontspec")
    (TeX-add-symbols
     '("setdefaultlanguage" (LaTeX-arg-polyglossia-lang  t  nil nil))