branch: externals/auctex
commit 868393581e2944e440453fbeffa49a7f3d79ccf0
Merge: 4837aba 25887f8
Author: Tassilo Horn <[email protected]>
Commit: Tassilo Horn <[email protected]>

    Merge branch 'master' into simplify-TeX-parse-error
---
 ChangeLog             |  343 +++++++++++++++++++++++++++++++++++++++++++++++++
 bib-cite.el           |    1 +
 doc/auctex.texi       |   55 ++++++++-
 doc/changes.texi      |    6 +
 doc/todo.texi         |    8 +-
 latex.el              |   29 +++--
 style/CJK.el          |    3 +-
 style/CJKutf8.el      |    3 +-
 style/MinionPro.el    |    3 +-
 style/acro.el         |    3 +-
 style/acronym.el      |    3 +-
 style/afterpage.el    |    3 +-
 style/alltt.el        |    3 +-
 style/alphanum.el     |    3 +-
 style/amsart.el       |    3 +-
 style/amsbook.el      |    3 +-
 style/amsbsy.el       |    3 +-
 style/amsmath.el      |    3 +-
 style/amsopn.el       |    6 +-
 style/amssymb.el      |    3 +-
 style/amstex.el       |    3 +-
 style/amstext.el      |    3 +-
 style/amsthm.el       |    3 +-
 style/array.el        |    3 +-
 style/article.el      |    3 +-
 style/austrian.el     |    3 +-
 style/babel.el        |    3 +-
 style/beamer.el       |    3 +-
 style/biblatex.el     |    3 +-
 style/bigdelim.el     |    3 +-
 style/bigstrut.el     |    3 +-
 style/bm.el           |    3 +-
 style/book.el         |    3 +-
 style/booktabs.el     |    3 +-
 style/bulgarian.el    |    3 +-
 style/captcont.el     |    3 +-
 style/comment.el      |    3 +-
 style/csquotes.el     |    3 +-
 style/czech.el        |    3 +-
 style/danish.el       |    3 +-
 style/dinbrief.el     |    3 +-
 style/dk.el           |    3 +-
 style/doc.el          |    3 +-
 style/dutch.el        |    3 +-
 style/emp.el          |    3 +-
 style/english.el      |    3 +-
 style/epigraph.el     |    3 +-
 style/epsf.el         |    3 +-
 style/everysel.el     |    3 +-
 style/exercise.el     |    3 +-
 style/fancyhdr.el     |    3 +-
 style/fancynum.el     |    3 +-
 style/fancyref.el     |    3 +-
 style/fancyvrb.el     |    3 +-
 style/filecontents.el |    3 +-
 style/flashcards.el   |    3 +-
 style/foils.el        |    3 +-
 style/fontspec.el     |    3 +-
 style/footmisc.el     |    3 +-
 style/francais.el     |    3 +-
 style/french.el       |    3 +-
 style/frenchb.el      |    3 +-
 style/german.el       |    3 +-
 style/graphics.el     |    3 +-
 style/graphicx.el     |    3 +-
 style/harvard.el      |    3 +-
 style/hyperref.el     |    3 +-
 style/icelandic.el    |    3 +-
 style/imakeidx.el     |    3 +-
 style/index.el        |    3 +-
 style/inputenc.el     |    3 +-
 style/italian.el      |    3 +-
 style/j-article.el    |    3 +-
 style/j-book.el       |    3 +-
 style/j-report.el     |    3 +-
 style/jarticle.el     |    3 +-
 style/jbook.el        |    3 +-
 style/jreport.el      |    3 +-
 style/jsarticle.el    |    3 +-
 style/jsbook.el       |    3 +-
 style/jura.el         |    3 +-
 style/jurabib.el      |    3 +-
 style/kantlipsum.el   |    3 +-
 style/kpfonts.el      |    3 +-
 style/latexinfo.el    |    3 +-
 style/letter.el       |    3 +-
 style/lettrine.el     |    3 +-
 style/lipsum.el       |    3 +-
 style/listings.el     |    3 +-
 style/longtable.el    |    3 +-
 style/lscape.el       |    3 +-
 style/ltx-base.el     |    3 +-
 style/ltxdoc.el       |    3 +-
 style/luacode.el      |    3 +-
 style/makeidx.el      |    3 +-
 style/mathtools.el    |    3 +-
 style/mdwlist.el      |    3 +-
 style/memoir.el       |    3 +-
 style/metalogo.el     |    3 +-
 style/mflogo.el       |    3 +-
 style/multicol.el     |    3 +-
 style/multido.el      |    3 +-
 style/multind.el      |    3 +-
 style/multirow.el     |    3 +-
 style/nameref.el      |    3 +-
 style/natbib.el       |    3 +-
 style/naustrian.el    |    3 +-
 style/ngerman.el      |    3 +-
 style/nicefrac.el     |    3 +-
 style/nomencl.el      |    3 +-
 style/paralist.el     |    3 +-
 style/pdfsync.el      |    3 +-
 style/placeins.el     |    3 +-
 style/plext.el        |    3 +-
 style/plfonts.el      |    3 +-
 style/plhb.el         |    3 +-
 style/polish.el       |    3 +-
 style/polski.el       |    3 +-
 style/prosper.el      |    3 +-
 style/psfig.el        |    3 +-
 style/pst-grad.el     |    3 +-
 style/pst-node.el     |    3 +-
 style/pst-plot.el     |    3 +-
 style/pst-slpe.el     |    3 +-
 style/pstricks.el     |    3 +-
 style/ragged2e.el     |    3 +-
 style/report.el       |    3 +-
 style/ruby.el         |    3 +-
 style/scrartcl.el     |    3 +-
 style/scrbase.el      |    3 +-
 style/scrbook.el      |    3 +-
 style/scrlttr2.el     |    3 +-
 style/scrpage2.el     |    3 +-
 style/scrreprt.el     |    3 +-
 style/setspace.el     |    3 +-
 style/shortvrb.el     |    3 +-
 style/siunitx.el      |   23 ++--
 style/slides.el       |    3 +-
 style/slovak.el       |    3 +-
 style/subfigure.el    |    3 +-
 style/swedish.el      |    3 +-
 style/tabularx.el     |    3 +-
 style/tabulary.el     |    3 +-
 style/ulem.el         |    3 +-
 style/unicode-math.el |    3 +-
 style/units.el        |    3 +-
 style/url.el          |    3 +-
 style/varioref.el     |    3 +-
 style/verbatim.el     |    3 +-
 style/virtex.el       |    3 +-
 style/xparse.el       |    5 +-
 style/xspace.el       |    3 +-
 tex-info.el           |   10 +-
 tex.el                |  183 +++++++++++++++++++++++----
 154 files changed, 896 insertions(+), 202 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b70f3a..ca4d1e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,346 @@
+2014-09-13  Vincent Bela�che  <[email protected]>
+
+       * latex.el (LaTeX-dialect): Correct doctstring for consistency
+       with definition of function TeX-add-style-hook.
+
+       * doc/auctex.texi (Simple Style): modify example with
+       'TeX-add-style-hook', so that 3rd argument is added. Modify @defun
+       of 'TeX-add-style-hook' also to document addition of 3rd argument.
+
+2014-09-11  Vincent Bela�che  <[email protected]>
+
+       * doc/changes.texi: Add information about style hook labelling by 
dialect.
+
+       * doc/todo.texi (Bugs): Update Bug #1 about style hook clash.
+
+       * style/xspace.el ("xspace"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/xparse.el ("xparse"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/virtex.el ("virtex"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/verbatim.el ("verbatim"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/varioref.el ("varioref"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/url.el ("url"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/units.el ("units"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/unicode-math.el ("unicode-math"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/ulem.el ("ulem"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/tabulary.el ("tabulary"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/tabularx.el ("tabularx"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/swedish.el ("swedish"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/subfigure.el ("subfigure"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/slovak.el ("slovak"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/slides.el ("slides"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/siunitx.el ("siunitx"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/shortvrb.el ("shortvrb"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/setspace.el ("setspace"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/scrreprt.el ("scrreprt"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/scrpage2.el ("scrpage2"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/scrlttr2.el ("scrlttr2"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/scrbook.el ("scrbook"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/scrbase.el ("scrbase"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/scrartcl.el ("scrartcl"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/ruby.el ("ruby"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/report.el ("report"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/ragged2e.el ("ragged2e"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pstricks.el ("pstricks"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pst-slpe.el ("pst-slpe"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pst-plot.el ("pst-plot"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pst-node.el ("pst-node"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pst-grad.el ("pst-grad"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/psfig.el ("psfig"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/prosper.el ("prosper"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/polski.el ("polski"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/polish.el ("polish"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/plhb.el ("plhb"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/plfonts.el ("plfonts"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/plext.el ("plext"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/placeins.el ("placeins"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/pdfsync.el ("pdfsync"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/paralist.el ("paralist"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/nomencl.el ("nomencl"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/nicefrac.el ("nicefrac"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/ngerman.el ("ngerman"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/naustrian.el ("naustrian"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/natbib.el ("natbib"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/nameref.el ("nameref"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/multirow.el ("multirow"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/multind.el ("multind"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/multido.el ("multido"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/multicol.el ("multicol"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/mflogo.el ("mflogo"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/metalogo.el ("metalogo"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/memoir.el ("memoir"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/mdwlist.el ("mdwlist"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/mathtools.el ("mathtools"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/makeidx.el ("makeidx"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/luacode.el ("luacode"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/ltxdoc.el ("ltxdoc"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/ltx-base.el ("ltx-base"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/lscape.el ("lscape"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/longtable.el ("longtable"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/listings.el ("listings"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/lipsum.el ("lipsum"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/lettrine.el ("lettrine"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/letter.el ("letter"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/latexinfo.el ("latexinfo"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/kpfonts.el ("kpfonts"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/kantlipsum.el ("kantlipsum"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/jurabib.el ("jurabib"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/jura.el ("jura"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/jsbook.el ("jsbook"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/jsarticle.el ("jsarticle"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/jreport.el ("jreport"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/jbook.el ("jbook"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/jarticle.el ("jarticle"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/j-report.el ("j-report"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/j-book.el ("j-book"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/j-article.el ("j-article"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/italian.el ("italian"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/inputenc.el ("inputenc"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/index.el ("index"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/imakeidx.el ("imakeidx"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/icelandic.el ("icelandic"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/hyperref.el ("hyperref"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/harvard.el ("harvard"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/graphicx.el ("graphicx"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/graphics.el ("graphics"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/german.el ("german"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/frenchb.el ("frenchb"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/french.el ("french"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/francais.el ("francais"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/footmisc.el ("footmisc"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/fontspec.el ("fontspec"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/foils.el ("foils"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/flashcards.el ("flashcards"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/filecontents.el ("filecontents"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/fancyvrb.el ("fancyvrb"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/fancyref.el ("fancyref"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/fancynum.el ("fancynum"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/fancyhdr.el ("fancyhdr"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/exercise.el ("exercise"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/everysel.el ("everysel"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/epsf.el ("epsf"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/epigraph.el ("epigraph"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/english.el ("english"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/emp.el ("emp"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/dutch.el ("dutch"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/doc.el ("doc"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/dk.el ("dk"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/dinbrief.el ("dinbrief"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/danish.el ("danish"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/czech.el ("czech"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/csquotes.el ("csquotes"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/comment.el ("comment"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/captcont.el ("captcont"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/bulgarian.el ("bulgarian"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/booktabs.el ("booktabs"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/book.el ("book"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/bm.el ("bm"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/bigstrut.el ("bigstrut"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/bigdelim.el ("bigdelim"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/biblatex.el ("biblatex"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/beamer.el ("beamer"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/babel.el ("babel"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/austrian.el ("austrian"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/article.el ("article"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/array.el ("array"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amsthm.el ("amsthm"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amstext.el ("amstext"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amstex.el ("amstex"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amssymb.el ("amssymb"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amsopn.el ("amsopn"): Add LaTeX-dialect to
+       TeX-add-style-hook call. Update header with correct filename.
+
+       * style/amsmath.el ("amsmath"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amsbsy.el ("amsbsy"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amsbook.el ("amsbook"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/amsart.el ("amsart"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/alphanum.el ("alphanum"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/alltt.el ("alltt"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/afterpage.el ("afterpage"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/acronym.el ("acronym"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/acro.el ("acro"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * style/MinionPro.el ("MinionPro"): Add LaTeX-dialect to 
TeX-add-style-hook call.
+
+       * style/CJKutf8.el ("CJKutf8"): Add LaTeX-dialect to TeX-add-style-hook 
call.
+
+       * style/CJK.el ("CJK"): Add LaTeX-dialect to TeX-add-style-hook call.
+
+       * bib-cite.el (eval-after-load "bibtex"): Add hook
+       TeX-bibtex-set-BibTeX-dialect to BibTex mode, this will set
+       'TeX-style-hook-dialect' to :bibtex for BibTeX files so that
+       Mos�'s problem should be solved.
+
+       * latex.el (LaTeX-common-initialization): set
+       'TeX-style-hook-dialect' to :latex for LaTeX files, and those in
+       LaTeX derived modes. Add LaTeX-dialect as DIALECT argument to all
+       calls of TeX-add-style-hook.
+
+       * tex.el (TeX-style-hook-list): Update docstring to make clear
+       that style hooks can also be in the form '[TeX-style-hook HOOK-FUN
+       DIALECT-SET]'.
+       (TeX-bibtex-set-BibTeX-dialect): New defun.
+       (TeX-style-hook-dialect-weight-alist): New defconst.
+       (TeX-shdex-eval): New defun.
+       (TeX-shdex-or TeX-shdex-and TeX-shdex-nor TeX-shdex-not)
+       (TeX-shdex-in-p TeX-shdex-listify): New defsubst.
+       (TeX-style-hook-dialect): New defvar, used to have style hooks
+       called only in corresponding context.
+       (TeX-add-style-hook): Add optional argument context for marking
+       hooks that must run only in non default (aka nil) dialect.
+       (TeX-keep-hooks-in-dialect): New defun, used for unloading only
+       those hooks in a dialect list.
+       (TeX-unload-style): Add optional argument context-list for
+       unloading only those hooks marked for contexts in that
+       context-list.
+       (TeX-run-style-hooks): Run style hook only when current style hook
+       context matches context for which hook is marked.
+
+       * tex-info.el (Texinfo-environment-list): Add 'html' and 'float'
+       environments.
+       (TeX-texinfo-mode): set 'TeX-style-hook-dialect' to :texinfo for
+       Texinfo files. Add macro '@caption'.
+
 2014-09-08  Tassilo Horn  <[email protected]>
 
        * tex.el (TeX-assoc-string): Remove docstring from defalias since
diff --git a/bib-cite.el b/bib-cite.el
index 8ac7ac9..612641c 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -941,6 +941,7 @@ runs bib-find, and [mouse-3] runs bib-display."
   (eval-after-load
    "bibtex"
    '(progn
+      (add-hook 'bibtex-mode-hook 'TeX-bibtex-set-BibTeX-dialect)
       (cond
        ((lookup-key bibtex-mode-map [menu-bar move/edit])
        (define-key-after
diff --git a/doc/auctex.texi b/doc/auctex.texi
index 84ac235..08bf8cf 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -4269,7 +4269,8 @@ Here is a simple example of a style file.
 (TeX-add-style-hook
  "book"
  (lambda () 
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 @end lisp
 
 The example is from the @AUCTeX{} sources and is loaded for any @LaTeX{}
@@ -4288,11 +4289,59 @@ hooks will be called for each buffer using the style 
file.
 Note that the basename of the style file and the name of the style hook
 should usually be identical.
 
-@defun TeX-add-style-hook @var{style} @var{hook}
+@defun TeX-add-style-hook @var{style} @var{hook} &optional @var{dialect-expr}
 Add @var{hook} to the list of functions to run when we use the @TeX{}
-file @var{style}.
+file @var{style} and the current dialect is one in the set derived from
+@var{dialect-expr}. When @var{dialect-expr} is omitted, then @var{hook}
+is allowed to be run whatever the current dialect is.
+
+@var{dialect-expr} may be one of:
+
+@itemize
+@item
+A symbol indicating a singleton containing one basic @TeX{} dialect,
+this symbol shall be selected among:
+@table @code
+@item :latex
+For all files in @LaTeX{} mode, or any mode derived thereof
+@item :bibtex
+For all files in Bib@TeX{} mode, or any mode derived thereof
+@item :texinfo
+For all files in @acronym{Texinfo} mode.
+@end table
+@item
+A logical expression like:
+@table @code
+@item (or @var{dialect-expression1} @dots{} @var{dialect-expression_@var{n}})
+For union of the sets of dialects corresponding to  @var{dialect-expression1}
+through @var{dialect-expression_@var{n}}
+@item (and @var{dialect-expression1} @dots{} @var{dialect-expression_@var{n}})
+For intersection of the sets of dialects corresponding to
+@var{dialect-expression1} through @var{dialect-expression_@var{n}}
+@item (nor @var{dialect-expression1} @dots{} @var{dialect-expression_@var{n}})
+For complement of the union sets of dialects corresponding to
+@var{dialect-expression1} through @var{dialect-expression_@var{n}}
+relatively to the set of all supported dialects
+@item (not @var{dialect-expr})
+For complement set of dialect corresponding to @var{dialect-expr}
+relatively to the set of all supported dialects
+@end table
+@end itemize
+
 @end defun
 
+In case of adding a style hook for @LaTeX{}, when calling function
+@code{TeX-add-style-hook} it is thought more futureproof for argument
+@var{dialect-expr} to pass constant @code{LaTeX-dialect} currently
+defined to @code{:latex}, rather than passing @code{:latex} directly.
+
+@defvr Constant LaTeX-dialect
+Default dialect for use with function @code{TeX-add-style-hook} for
+argument @var{dialect-expr} when the hook is to be run only on LaTeX
+file, or any mode derived thereof.
+@end defvr
+
+
 @node Adding Macros
 @subsection Adding Support for Macros
 @cindex Adding macros
diff --git a/doc/changes.texi b/doc/changes.texi
index 6d2e7b5..8f50775 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -128,6 +128,12 @@ per file basis using the @code{TeX-command-extra-options} 
option.
 @item
 Now @kbd{C-c C-e document @key{RET}}, in an empty document, prompts for
 @samp{\usepackage} macros in addition to @samp{\documentclass}.
+
+@item
+@code{TeX-add-style-hook} has now a third argument to tell AUCTeX for
+which dialect (LaTeX, Texinfo or BibTeX) the style hook is
+registers. Labelling style hook by dialect will avoid applying them not
+in the right context.
 @end itemize
 
 @heading News since 11.87
diff --git a/doc/todo.texi b/doc/todo.texi
index 1c78673..cd5b2de 100644
--- a/doc/todo.texi
+++ b/doc/todo.texi
@@ -264,9 +264,11 @@ Hook up the letter environment with @file{bbdb.el}.
 @c FIXME: Are those bugs still present?
 
 @itemize @bullet
-@item The parsed files and style hooks for @file{example.dtx},
-@file{example.sty}, @file{example.drv} and @file{example.bib} all
-clash.  Bad.
+@item
+The style hooks automatically generated by parsing files for
+@file{example.dtx}, @file{example.sty}, @file{example.drv} and
+@file{example.bib} all clash.  Bad.  Clash with hand-written style hooks
+should be removed by dialect discrimination --- to be checked.
 
 @item
 @kbd{C-c `} should always stay in the current window, also when it finds
diff --git a/latex.el b/latex.el
index b260625..32a431f 100644
--- a/latex.el
+++ b/latex.el
@@ -4535,6 +4535,12 @@ use \[customize]."
     (unless (lookup-key map (LaTeX-math-abbrev-prefix))
       (define-key map (LaTeX-math-abbrev-prefix) 'self-insert-command))))
 
+(defconst LaTeX-dialect :latex
+  "Default dialect for use with function `TeX-add-style-hook' for
+argument DIALECT-EXPR when the hook is to be run only on LaTeX
+file, or any mode derived thereof. See variable
+`TeX-style-hook-dialect'." )
+
 (defconst LaTeX-math-default
   '((?a "alpha" "Greek Lowercase" 945) ;; #X03B1
     (?b "beta" "Greek Lowercase" 946) ;; #X03B2
@@ -5775,6 +5781,7 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\' or $."
 
   (setq TeX-header-end LaTeX-header-end
        TeX-trailer-start LaTeX-trailer-start)
+  (set (make-local-variable 'TeX-style-hook-dialect) :latex)
 
   (require 'outline)
   (set (make-local-variable 'outline-level) 'LaTeX-outline-level)
@@ -6147,7 +6154,8 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\' or $."
                      (lambda ()
                        (setq TeX-font-list LaTeX-font-list)
                        (setq TeX-font-replace-function 'TeX-font-replace-macro)
-                       (run-hooks 'LaTeX2e-hook)))
+                       (run-hooks 'LaTeX2e-hook))
+                     LaTeX-dialect)
 
   (TeX-add-style-hook "latex2"
                      ;; Use old fonts for `\documentstyle' documents.
@@ -6155,27 +6163,28 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\' or $."
                        (setq TeX-font-list (default-value 'TeX-font-list))
                        (setq TeX-font-replace-function
                              (default-value 'TeX-font-replace-function))
-                       (run-hooks 'LaTeX2-hook)))
+                       (run-hooks 'LaTeX2-hook))
+                     LaTeX-dialect)
 
   ;; There must be something better-suited, but I don't understand the
   ;; parsing properly.  -- dak
-  (TeX-add-style-hook "pdftex" 'TeX-PDF-mode-on)
-  (TeX-add-style-hook "pdftricks" 'TeX-PDF-mode-on)
-  (TeX-add-style-hook "pst-pdf" 'TeX-PDF-mode-on)
-  (TeX-add-style-hook "dvips" 'TeX-PDF-mode-off)
+  (TeX-add-style-hook "pdftex" 'TeX-PDF-mode-on LaTeX-dialect)
+  (TeX-add-style-hook "pdftricks" 'TeX-PDF-mode-on LaTeX-dialect)
+  (TeX-add-style-hook "pst-pdf" 'TeX-PDF-mode-on LaTeX-dialect)
+  (TeX-add-style-hook "dvips" 'TeX-PDF-mode-off LaTeX-dialect)
   ;; This is now done in style/pstricks.el because it prevents other
   ;; pstricks style files from being loaded.
   ;;   (TeX-add-style-hook "pstricks" 'TeX-PDF-mode-off)
-  (TeX-add-style-hook "psfrag" 'TeX-PDF-mode-off)
-  (TeX-add-style-hook "dvipdf" 'TeX-PDF-mode-off)
-  (TeX-add-style-hook "dvipdfm" 'TeX-PDF-mode-off)
+  (TeX-add-style-hook "psfrag" 'TeX-PDF-mode-off LaTeX-dialect)
+  (TeX-add-style-hook "dvipdf" 'TeX-PDF-mode-off LaTeX-dialect)
+  (TeX-add-style-hook "dvipdfm" 'TeX-PDF-mode-off LaTeX-dialect)
   ;;  (TeX-add-style-hook "DVIoutput" 'TeX-PDF-mode-off)
   ;;
   ;;  Well, DVIoutput indicates that we want to run PDFTeX and expect to
   ;;  get DVI output.  Ugh.
   (TeX-add-style-hook "ifpdf" (lambda ()
                                (TeX-PDF-mode-on)
-                               (TeX-PDF-mode-off)))
+                               (TeX-PDF-mode-off)) LaTeX-dialect)
   ;; ifpdf indicates that we cater for either.  So calling both
   ;; functions will make sure that the default will get used unless the
   ;; user overrode it.
diff --git a/style/CJK.el b/style/CJK.el
index fa285bd..f21d1a9 100644
--- a/style/CJK.el
+++ b/style/CJK.el
@@ -88,6 +88,7 @@ The function can be used for CJK and CJK* environments."
    ;; New environments
    (LaTeX-add-environments
     '("CJK" LaTeX-env-CJK)
-    '("CJK*" LaTeX-env-CJK))))
+    '("CJK*" LaTeX-env-CJK)))
+ LaTeX-dialect)
 
 ;;; CJK.el ends here
diff --git a/style/CJKutf8.el b/style/CJKutf8.el
index ea3c2e3..c9e16b6 100644
--- a/style/CJKutf8.el
+++ b/style/CJKutf8.el
@@ -33,6 +33,7 @@
 (TeX-add-style-hook
  "CJKutf8"
  (lambda ()
-   (TeX-run-style-hooks "CJK")))
+   (TeX-run-style-hooks "CJK"))
+ LaTeX-dialect)
 
 ;;; CJKutf8.el ends here
diff --git a/style/MinionPro.el b/style/MinionPro.el
index 7151c36..3441911 100644
--- a/style/MinionPro.el
+++ b/style/MinionPro.el
@@ -58,7 +58,8 @@
                                ("textsw" "{")
                                ("textssc" "{"))
                              'textual)
-     (font-latex-add-keywords '(("figureversion" "{")) 'variable))))
+     (font-latex-add-keywords '(("figureversion" "{")) 'variable)))
+ LaTeX-dialect)
 
 (defvar LaTeX-MinionPro-package-options
   '("smallfamily" "medfamily" "fullfamily" "noopticals" "opticals"
diff --git a/style/acro.el b/style/acro.el
index 93eb32f..fda4b71 100644
--- a/style/acro.el
+++ b/style/acro.el
@@ -282,7 +282,8 @@ be a list with strings to be used as values for the key."
                                ("iacflike" "*{")
                                ("Iacflike" "*{")
                                ("acuse" "{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defun LaTeX-acro-package-options ()
   "Prompt for package options for the acro package."
diff --git a/style/acronym.el b/style/acronym.el
index 11295d1..ea29d1b 100644
--- a/style/acronym.el
+++ b/style/acronym.el
@@ -167,7 +167,8 @@ string."
                                ("acroplural" "{[{")
                                ("acrodefplural" "{[{")
                                ("newacroplural" "{[{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defvar LaTeX-acronym-package-options
   '("footnote" "nohyperlinks" "printonlyused" "withpage" "smaller" "dua" 
"nolist")
diff --git a/style/afterpage.el b/style/afterpage.el
index 5e8c579..ec0d320 100644
--- a/style/afterpage.el
+++ b/style/afterpage.el
@@ -34,7 +34,8 @@
  "afterpage"
  (lambda ()
    (TeX-add-symbols
-    '("afterpage" t))))
+    '("afterpage" t)))
+ LaTeX-dialect)
 
 (defvar LaTeX-afterpage-package-options nil
   "Package options for afterpage.")
diff --git a/style/alltt.el b/style/alltt.el
index a266a88..e5c5684 100644
--- a/style/alltt.el
+++ b/style/alltt.el
@@ -47,7 +47,8 @@
      (font-latex-set-syntactic-keywords)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 (defvar LaTeX-alltt-package-options nil
   "Package options for the alltt package.")
diff --git a/style/alphanum.el b/style/alphanum.el
index 43ce10e..64d694c 100644
--- a/style/alphanum.el
+++ b/style/alphanum.el
@@ -92,7 +92,8 @@
    (if (fboundp 'reftex-add-section-levels)
        (reftex-add-section-levels
        '(("toc" .  reftex-get-section-level-alphanum)
-         ("sub" .  reftex-get-section-level-alphanum))))))
+         ("sub" .  reftex-get-section-level-alphanum)))))
+ LaTeX-dialect)
 
 ;; Local Variables:
 ;; coding: iso-8859-1
diff --git a/style/amsart.el b/style/amsart.el
index 51a2902..8e3ae5c 100644
--- a/style/amsart.el
+++ b/style/amsart.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook "amsart"
  (function
   (lambda ()
-    (TeX-run-style-hooks "amsmath" "amsthm"))))
+    (TeX-run-style-hooks "amsmath" "amsthm")))
+ LaTeX-dialect)
 
 ;;; amsart.el ends here.
diff --git a/style/amsbook.el b/style/amsbook.el
index ccbc84e..192b807 100644
--- a/style/amsbook.el
+++ b/style/amsbook.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook "amsbook"
  (function
   (lambda ()
-    (TeX-run-style-hooks "amsmath" "amsthm"))))
+    (TeX-run-style-hooks "amsmath" "amsthm")))
+ LaTeX-dialect)
 
 ;;; amsbook.el ends here.
diff --git a/style/amsbsy.el b/style/amsbsy.el
index dd2605c..3302a8b 100644
--- a/style/amsbsy.el
+++ b/style/amsbsy.el
@@ -10,7 +10,8 @@
     (TeX-add-symbols
      '("boldsymbol" "Symbol")
      '("pmb"        "Symbol")
-     ))))
+     )))
+ LaTeX-dialect)
 
 (defvar LaTeX-amsbsy-package-options nil
   "Package options for the amsbsy package.")
diff --git a/style/amsmath.el b/style/amsmath.el
index ce732d5..0326561 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -157,7 +157,8 @@
 
     ;; If RefTeX is loaded, make it recognize the amsmath environments.
     (when (fboundp 'reftex-add-to-label-alist)
-      (reftex-add-to-label-alist '(AMSTeX))))))
+      (reftex-add-to-label-alist '(AMSTeX)))))
+ LaTeX-dialect)
 
 (defun LaTeX-amsmath-env-alignat (env)
   "Insert ENV with column number specifications.
diff --git a/style/amsopn.el b/style/amsopn.el
index 8843759..85e3f17 100644
--- a/style/amsopn.el
+++ b/style/amsopn.el
@@ -1,4 +1,4 @@
-;;; amsnopn.el --- AUCTeX style for the `amsnopn.sty' AMS-LaTeX package
+;;; amsopn.el --- AUCTeX style for the `amsnopn.sty' AMS-LaTeX package
 
 ;; Copyright (C) 1997, 2002, 2005, 2013 Free Software Foundation, Inc.
 
@@ -43,7 +43,9 @@
 
     (add-to-list 'LaTeX-auto-regexp-list
                 '("\\DeclareMathOperator\*?{?\\\([A-Za-z0-9]+\)}?"
-                  1 TeX-auto-symbol)))))
+                  1 TeX-auto-symbol))))
+ LaTeX-dialect
+ )
 
 (defvar LaTeX-amsopn-package-options '("namelimits" "nonamelimits")
   "Package options for the amsopn package.")
diff --git a/style/amssymb.el b/style/amssymb.el
index 78ebd63..2aec6b6 100644
--- a/style/amssymb.el
+++ b/style/amssymb.el
@@ -240,7 +240,8 @@
     "varkappa"
     "Bbbk"
     "hslash"
-    "backepsilon")))
+    "backepsilon"))
+ LaTeX-dialect)
 
 (defvar LaTeX-amssymb-package-options '("psamsfonts")
   "Package options for the amssymb package.")
diff --git a/style/amstex.el b/style/amstex.el
index 347d72f..97a8b70 100644
--- a/style/amstex.el
+++ b/style/amstex.el
@@ -45,7 +45,8 @@
  (function
   (lambda ()
     (unless (memq major-mode '(plain-tex-mode ams-tex-mode))
-      (TeX-run-style-hooks "amsmath")))))
+      (TeX-run-style-hooks "amsmath"))))
+ LaTeX-dialect)
 
 (defvar LaTeX-amstex-package-options '("noamsfonts" "psamsfonts" 
                                       "intlimits" "nointlimits"
diff --git a/style/amstext.el b/style/amstext.el
index a9aa855..ea6f619 100644
--- a/style/amstext.el
+++ b/style/amstext.el
@@ -8,7 +8,8 @@
  (function
   (lambda ()
     (TeX-add-symbols
-     '("text" t)))))
+     '("text" t))))
+ LaTeX-dialect)
 
 (defvar LaTeX-amstext-package-option nil
   "Package options for the amstext package.")
diff --git a/style/amsthm.el b/style/amsthm.el
index 2214980..15cbf3a 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -59,7 +59,8 @@
      (font-latex-add-keywords '(("newtheorem" "*{[{[")
                                ("theoremstyle" "{")
                                ("newtheoremstyle" "{{{{{{{{{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defun LaTeX-amsthm-complete-theoremstyle (&rest ignore)
   (insert TeX-grop
diff --git a/style/array.el b/style/array.el
index 7775abb..51a27e8 100644
--- a/style/array.el
+++ b/style/array.el
@@ -43,7 +43,8 @@
    (LaTeX-add-lengths "extratabsurround" "extrarowheight")
 
    ;; `array.sty' adds some new column specification letters.
-   (set (make-local-variable 'LaTeX-array-column-letters) "clrpmb")))
+   (set (make-local-variable 'LaTeX-array-column-letters) "clrpmb"))
+ LaTeX-dialect)
 
 (defvar LaTeX-array-package-options nil
   "Package options for array.")
diff --git a/style/article.el b/style/article.el
index ca6281f..d4842f1 100644
--- a/style/article.el
+++ b/style/article.el
@@ -14,6 +14,7 @@
    (LaTeX-largest-level-set "section")
    (LaTeX-add-counters "part" "section" "subsection" "subsubsection" 
"paragraph"
                       "subparagraph" "figure" "table")
-   (LaTeX-add-pagestyles "headings" "myheadings")))
+   (LaTeX-add-pagestyles "headings" "myheadings"))
+ LaTeX-dialect)
 
 ;;; article.el ends here
diff --git a/style/austrian.el b/style/austrian.el
index 13f28a8..fce8906 100644
--- a/style/austrian.el
+++ b/style/austrian.el
@@ -34,6 +34,7 @@
 (TeX-add-style-hook
  "austrian"
  (lambda ()
-   (TeX-run-style-hooks "german")))
+   (TeX-run-style-hooks "german"))
+ LaTeX-dialect)
 
 ;;; austrian.el ends here
diff --git a/style/babel.el b/style/babel.el
index 36c93be..88b10b2 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -167,7 +167,8 @@
      (font-latex-add-keywords '(("defineshorthand" "{{")
                                ("aliasshorthand" "{{")
                                ("languageattribute" "{{"))
-                             'variable))))
+                             'variable)))
+ LaTeX-dialect)
 
 (defun LaTeX-babel-package-options ()
   "Prompt for package options for the babel package."
diff --git a/style/beamer.el b/style/beamer.el
index d79c0a4..c108f2b 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -187,7 +187,8 @@
      (font-latex-set-syntactic-keywords)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 (defun TeX-arg-beamer-overlay-spec (optional &optional prompt)
   "Prompt for overlay specification."
diff --git a/style/biblatex.el b/style/biblatex.el
index d5c3513..8a42a45 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -478,7 +478,8 @@ for citation keys."
     "NewBibliographyString")
    (LaTeX-declare-expert-environments
     "biblatex"
-    "refsection" "refsegment")))
+    "refsection" "refsegment"))
+ LaTeX-dialect)
 
 (defvar LaTeX-biblatex-package-options-list
   (append
diff --git a/style/bigdelim.el b/style/bigdelim.el
index 8d55c4a..085185b 100644
--- a/style/bigdelim.el
+++ b/style/bigdelim.el
@@ -37,7 +37,8 @@
     '("ldelim" TeX-arg-bigdelim-brace "Number of rows for multirow"
       "Width in multirow" [ "Text in multirow" ])
     '("rdelim" TeX-arg-bigdelim-brace "Number of rows for multirow"
-      "Width in multirow" [ "Text in multirow" ]))))
+      "Width in multirow" [ "Text in multirow" ])))
+ LaTeX-dialect)
 
 (defun TeX-arg-bigdelim-brace (optional &optional prompt)
   "Prompt for a single brace, and do not insert the matching
diff --git a/style/bigstrut.el b/style/bigstrut.el
index 0c9953e..14269db 100644
--- a/style/bigstrut.el
+++ b/style/bigstrut.el
@@ -34,7 +34,8 @@
  (lambda ()
    (TeX-add-symbols
     "bigstrutsetup"
-    '("bigstrut" [ TeX-arg-bigstrut ]))))
+    '("bigstrut" [ TeX-arg-bigstrut ])))
+ LaTeX-dialect)
 
 (defun TeX-arg-bigstrut (optional &optional prompt)
   "Prompt for the optional argument in \bigstrut"
diff --git a/style/bm.el b/style/bm.el
index 565095c..d735e62 100644
--- a/style/bm.el
+++ b/style/bm.el
@@ -46,7 +46,8 @@
      (font-latex-add-keywords '(("DeclareBoldMathCommand" "[|{\{")
                                ("bmdefine" "|{\{")
                                ("hmdefine" "|{\{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defvar LaTeX-bm-package-options nil
   "Package options for the bm package.")
diff --git a/style/book.el b/style/book.el
index e8e3f31..cbc9813 100644
--- a/style/book.el
+++ b/style/book.el
@@ -15,6 +15,7 @@
    (LaTeX-largest-level-set "chapter")
    (LaTeX-add-counters "part" "chapter" "section" "subsection" "subsubsection"
                       "paragraph" "subparagraph" "figure" "table")
-   (LaTeX-add-pagestyles "headings" "myheadings")))
+   (LaTeX-add-pagestyles "headings" "myheadings"))
+ LaTeX-dialect)
 
 ;;; book.el ends here
diff --git a/style/booktabs.el b/style/booktabs.el
index ee19459..20145af 100644
--- a/style/booktabs.el
+++ b/style/booktabs.el
@@ -70,7 +70,8 @@ PROMPT is the value of the prompt to be shown."
                                ("addlinespace" "[")
                                ("morecmidrules" "")
                                ("specialrule" "{{{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defvar LaTeX-booktabs-package-options nil
   "Package options for the booktabs package.")
diff --git a/style/bulgarian.el b/style/bulgarian.el
index 77cb2b2..1f4103c 100644
--- a/style/bulgarian.el
+++ b/style/bulgarian.el
@@ -49,6 +49,7 @@
    (when (fboundp 'font-latex-add-quotes)
      (font-latex-add-quotes '("\"`" "\"'"))
      (font-latex-add-quotes '("\"<" "\">" french)))
-   (run-hooks 'TeX-language-bg-hook)))
+   (run-hooks 'TeX-language-bg-hook))
+ LaTeX-dialect)
 
 ;;; bulgarian.el ends here
diff --git a/style/captcont.el b/style/captcont.el
index ffa48bf..b2f4b5f 100644
--- a/style/captcont.el
+++ b/style/captcont.el
@@ -37,7 +37,8 @@
     '("captcont*" [ "list entry" ] "Caption"))
    ;; Fontification
    (when (featurep 'font-latex)
-     (font-latex-add-keywords '(("captcont" "*[{")) 'textual))))
+     (font-latex-add-keywords '(("captcont" "*[{")) 'textual)))
+ LaTeX-dialect)
 
 (defvar LaTeX-captcont-package-options '("figbotcap" "figtopcap" "tabbotcap"
                                         "tabtopcap")
diff --git a/style/comment.el b/style/comment.el
index c842d20..ac33ebd 100644
--- a/style/comment.el
+++ b/style/comment.el
@@ -64,6 +64,7 @@
                              'variable)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 ;;; comment.el ends here
diff --git a/style/csquotes.el b/style/csquotes.el
index 50aa1f9..fd112f8 100644
--- a/style/csquotes.el
+++ b/style/csquotes.el
@@ -240,6 +240,7 @@ the insertion of optional arguments."
                                ("SetBlockThreshold" "{")
                                ("SetBlockEnvironment" "{")
                                ("SetCiteCommand" "{"))
-                             'variable)))))
+                             'variable))))
+ LaTeX-dialect)
 
 ;;; csquotes.el ends here
diff --git a/style/czech.el b/style/czech.el
index 6168189..7d709ed 100644
--- a/style/czech.el
+++ b/style/czech.el
@@ -5,4 +5,5 @@
  (lambda ()
    (unless (eq (car TeX-quote-language) 'override)
      (setq TeX-quote-language `("czech" "\uv{" "}" ,TeX-quote-after-quote)))
-   (run-hooks 'TeX-language-cz-hook)))
+   (run-hooks 'TeX-language-cz-hook))
+ LaTeX-dialect)
diff --git a/style/danish.el b/style/danish.el
index 775fee0..fa9ab6f 100644
--- a/style/danish.el
+++ b/style/danish.el
@@ -12,6 +12,7 @@
    (when (fboundp 'font-latex-add-quotes)
      (font-latex-add-quotes '("\"`" "\"'"))
      (font-latex-add-quotes '("\">" "\"<" german)))
-   (run-hooks 'TeX-language-dk-hook)))
+   (run-hooks 'TeX-language-dk-hook))
+ LaTeX-dialect)
 
 ;;; danish.el ends here
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 8a20519..cb9fb6b 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -60,7 +60,8 @@
      '("backaddress" "Retouradresse: ")
      '("signature" "Unterschrift: ")
      '("opening" "Anrede: ")
-     '("closing" "Schluss: ")))))
+     '("closing" "Schluss: "))))
+ LaTeX-dialect)
 
 (defmacro LaTeX-dinbrief-insert (&rest args)
   "Insert text ignoring active markers."
diff --git a/style/dk.el b/style/dk.el
index a508d8d..01a7411 100644
--- a/style/dk.el
+++ b/style/dk.el
@@ -4,6 +4,7 @@
 
 (TeX-add-style-hook "dk"
  (function (lambda ()
-   (run-hooks 'TeX-language-dk-hook))))
+            (run-hooks 'TeX-language-dk-hook)))
+ LaTeX-dialect)
 
 ;;; dk.el ends here
diff --git a/style/doc.el b/style/doc.el
index e45f0f7..3176368 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -151,7 +151,8 @@
     "GetFileInfo"
     "filename"
     "fileinfo")
-   (TeX-run-style-hooks "shortvrb")))
+   (TeX-run-style-hooks "shortvrb"))
+ LaTeX-dialect)
 
 ;; Local Variables:
 ;; coding: iso-8859-1
diff --git a/style/dutch.el b/style/dutch.el
index 3e7c1ec..c2c56a5 100644
--- a/style/dutch.el
+++ b/style/dutch.el
@@ -4,6 +4,7 @@
 
 (TeX-add-style-hook "dutch"
  (function (lambda ()
-   (run-hooks 'TeX-language-nl-hook))))
+            (run-hooks 'TeX-language-nl-hook)))
+ LaTeX-dialect)
 
 ;;; dutch.el ends here
diff --git a/style/emp.el b/style/emp.el
index 4e5f867..16400ee 100644
--- a/style/emp.el
+++ b/style/emp.el
@@ -38,7 +38,8 @@
      '("empdef" LaTeX-env-emp-gen)
      '("empgraph" LaTeX-env-emp-gen)
      '("empcmds")
-     ))))
+     )))
+ LaTeX-dialect)
 
 (defun LaTeX-env-emp-gen (environment-name)
    "Ask for file, width and length. Insert environment-name environment
diff --git a/style/english.el b/style/english.el
index f385a24..90254c2 100644
--- a/style/english.el
+++ b/style/english.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "english"
  (lambda ()
-   (run-hooks 'TeX-language-en-hook)))
+   (run-hooks 'TeX-language-en-hook))
+ LaTeX-dialect)
 
 ;;; english.el ends here
diff --git a/style/epigraph.el b/style/epigraph.el
index 942daf5..c25b148 100644
--- a/style/epigraph.el
+++ b/style/epigraph.el
@@ -60,7 +60,8 @@
                                ("qitem" "{{")
                                ("dropchapter" "{")
                                ("epigraphhead" "{")) 'function)
-     (font-latex-add-keywords '("cleartoevenpage") 'warning))))
+     (font-latex-add-keywords '("cleartoevenpage") 'warning)))
+ LaTeX-dialect)
 
 (defvar LaTeX-epigraph-package-options nil
   "Package options for the epigraph package.")
diff --git a/style/epsf.el b/style/epsf.el
index f8b2c9f..797f801 100644
--- a/style/epsf.el
+++ b/style/epsf.el
@@ -14,7 +14,8 @@
     "epsflly" "epsfury" "testit" "epsfgetlitbb"
     "epsfnormal" "epsfgetbb" "other" "epsfsetgraph"
     "PsFragSpecialArgs" "epsfaux" "testit" "epsfgrab"
-    "epsfllx" "epsflly" "epsfury" "epsfverbosetrue")))
+    "epsfllx" "epsflly" "epsfury" "epsfverbosetrue"))
+ LaTeX-dialect)
 
 (defun TeX-arg-epsfsize (optional &optional prompt definition)
   "Create a line that print epsf figures at a certain percentage"
diff --git a/style/everysel.el b/style/everysel.el
index cd69322..da6101d 100644
--- a/style/everysel.el
+++ b/style/everysel.el
@@ -36,7 +36,8 @@
     ;; adds a hook (the argument code) to be called after \selectfont
     '("EverySelectfont" 1)
     ;; adds a hook to be called after the next \selectfont
-    '("AtNextSelectont" 1))))
+    '("AtNextSelectont" 1)))
+ LaTeX-dialect)
 
 (defvar LaTeX-everysel-package-options nil
   "Package options for the everysel package.")
diff --git a/style/exercise.el b/style/exercise.el
index 6dfb179..5fe3092 100644
--- a/style/exercise.el
+++ b/style/exercise.el
@@ -54,7 +54,8 @@
     '("DifficultyMarker")
     '("listofexercises")
     '("ListOfExerciseInToc")
-    '("ExerciseLevelInToc"))))
+    '("ExerciseLevelInToc")))
+ LaTeX-dialect)
 
 (defvar LaTeX-exercise-package-options '("noexercise" "noanswer" 
"exerciseonly" "answeronly" "nothing" "answerdelayed" "exercisedelayed" 
"lastexercise")
   "Package options for the exercise package.")
diff --git a/style/fancyhdr.el b/style/fancyhdr.el
index 3d777b6..76f33c7 100644
--- a/style/fancyhdr.el
+++ b/style/fancyhdr.el
@@ -82,7 +82,8 @@
                                 ("plainfootrulewidth" "")) 'variable)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 ;; Because there can be many positions, `TeX-completing-read-multiple' is used
 ;; instead of just `completing-read', and a `collection' argument is provided 
as
diff --git a/style/fancynum.el b/style/fancynum.el
index 967b9c2..a04be76 100644
--- a/style/fancynum.el
+++ b/style/fancynum.el
@@ -36,7 +36,8 @@
     '("fnum" t)
     '("setfnumdsym" t)
     '("setfnummsym" t)
-    '("setfnumgsym" t))))
+    '("setfnumgsym" t)))
+ LaTeX-dialect)
 
 (defvar LaTeX-fancynum-package-options
   '("english" "french" "tight" "loose" "commas" "thinspaces" "plain")
diff --git a/style/fancyref.el b/style/fancyref.el
index 2aa9c8c..9d870e7 100644
--- a/style/fancyref.el
+++ b/style/fancyref.el
@@ -92,7 +92,8 @@
      ;; Fontification
      (when (and (featurep 'font-latex)
                (eq TeX-install-font-lock 'font-latex-setup))
-       (font-latex-add-keywords '(("fref" "[{") ("Fref" "[{")) 'reference))))
+       (font-latex-add-keywords '(("fref" "[{") ("Fref" "[{")) 'reference)))
+   LaTeX-dialect)
 
 ;; The following list keeps a list of available format names
 ;; Note that this list is only updated when a format is used, not
diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index 3723ea8..92718b4 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -197,7 +197,8 @@
      (font-latex-set-syntactic-keywords)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 (defvar LaTeX-fancyvrb-package-options nil
   "Package options for the fancyvrb package.")
diff --git a/style/filecontents.el b/style/filecontents.el
index 776c768..ea3c60a 100644
--- a/style/filecontents.el
+++ b/style/filecontents.el
@@ -38,7 +38,8 @@
  (lambda ()
    (LaTeX-add-environments
     '("filecontents" LaTeX-env-filecontents)
-    '("filecontents*" LaTeX-env-filecontents))))
+    '("filecontents*" LaTeX-env-filecontents)))
+ LaTeX-dialect)
 
 (defun LaTeX-env-filecontents (environment)
   "Insert ENVIRONMENT with filename for contents."
diff --git a/style/flashcards.el b/style/flashcards.el
index 27e96d1..6f26c15 100644
--- a/style/flashcards.el
+++ b/style/flashcards.el
@@ -55,6 +55,7 @@
                                ("cardbackstyle" "[{")
                                ("cardfrontheadstyle" "[{")
                                ("cardfrontfootstyle" "[{"))
-                             'variable))))
+                             'variable)))
+ LaTeX-dialect)
 
 ;;; flashcards.el ends here
diff --git a/style/foils.el b/style/foils.el
index f4e7e77..e3fedd8 100644
--- a/style/foils.el
+++ b/style/foils.el
@@ -11,7 +11,8 @@
     (setq LaTeX-default-style "foils")
     (setq LaTeX-default-options '("landscape"))
     (TeX-add-symbols
-     '("foilhead" [ "Rubric-body separation" ] "Foil rubric")))))
+     '("foilhead" [ "Rubric-body separation" ] "Foil rubric"))))
+ LaTeX-dialect)
 
 (defun LaTeX-style-foils nil
   "Prompt for and insert foiltex options."
diff --git a/style/fontspec.el b/style/fontspec.el
index f9137fb..c483d0a 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -225,7 +225,8 @@ to retrieve the list of fonts."
                                ("addfontfeature" "{")
                                ("newfontscript" "{{")
                                ("newfontlanguage" "{{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defvar LaTeX-fontspec-package-options
   '("math" "no-math" "config" "no-config" "quiet" "silent")
diff --git a/style/footmisc.el b/style/footmisc.el
index 2efe526..dec612e 100644
--- a/style/footmisc.el
+++ b/style/footmisc.el
@@ -60,7 +60,8 @@
                                 ("DefineFNsymbolsTM" "{{")
                                 ("DefineFNsymbolsTM*" "{{")
                                ("setfnsymbol" "{")) 'function)
-     (font-latex-add-keywords '(("footnoteref")) 'reference))))
+     (font-latex-add-keywords '(("footnoteref")) 'reference)))
+ LaTeX-dialect)
 
 (defvar LaTeX-footmisc-package-options '("perpage" "side" "ragged"
                                          "para" "symbol" "symbol*"
diff --git a/style/francais.el b/style/francais.el
index 323d545..1723b59 100644
--- a/style/francais.el
+++ b/style/francais.el
@@ -36,6 +36,7 @@
 (TeX-add-style-hook
  "francais"
  (lambda ()
-   (TeX-run-style-hooks "frenchb")))
+   (TeX-run-style-hooks "frenchb"))
+ LaTeX-dialect)
 
 ;;; francais.el ends here
diff --git a/style/french.el b/style/french.el
index 31a468a..7aefe3d 100644
--- a/style/french.el
+++ b/style/french.el
@@ -43,6 +43,7 @@
              (not (member "frenchpro" TeX-active-styles))
              (not (member "frenchle" TeX-active-styles))
              (not (member "mlp" TeX-active-styles)))
-     (TeX-run-style-hooks "frenchb"))))
+     (TeX-run-style-hooks "frenchb")))
+ LaTeX-dialect)
 
 ;;; french.el ends here
diff --git a/style/frenchb.el b/style/frenchb.el
index 83f9002..71ef1f4 100644
--- a/style/frenchb.el
+++ b/style/frenchb.el
@@ -73,6 +73,7 @@
               (concat "\fg"
                       (unless (member "xspace" TeX-active-styles) "{}")))
             ,TeX-quote-after-quote)))
-   (run-hooks 'TeX-language-fr-hook)))
+   (run-hooks 'TeX-language-fr-hook))
+ LaTeX-dialect)
 
 ;;; frenchb.el ends here
diff --git a/style/german.el b/style/german.el
index d1acbbf..51a35fe 100644
--- a/style/german.el
+++ b/style/german.el
@@ -44,6 +44,7 @@
      (font-latex-add-quotes '("\">" "\"<" german))
      ;; Prevent "| from leading to color bleed.
      (font-latex-add-to-syntax-alist (list (cons ?\" "\"))))
-   (run-hooks 'TeX-language-de-hook)))
+   (run-hooks 'TeX-language-de-hook))
+ LaTeX-dialect)
 
 ;;; german.el ends here
diff --git a/style/graphics.el b/style/graphics.el
index bffabc9..ffe5bd1 100644
--- a/style/graphics.el
+++ b/style/graphics.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook "graphics"
  (function
   (lambda ()
-    (TeX-run-style-hooks "graphicx"))))
+    (TeX-run-style-hooks "graphicx")))
+ LaTeX-dialect)
 
 ;;; graphics.el ends here.
diff --git a/style/graphicx.el b/style/graphicx.el
index a35d151..a06aabf 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -50,7 +50,8 @@
                                ("rotatebox" "[{{")
                                ("scalebox" "{[{"))
                              'textual)
-     (font-latex-add-keywords '(("includegraphics" "*[[{")) 'reference))))
+     (font-latex-add-keywords '(("includegraphics" "*[[{")) 'reference)))
+ LaTeX-dialect)
 
 (defun LaTeX-includegraphics-extensions (&optional list)
   "Return appropriate extensions for input files to \includegraphics."
diff --git a/style/harvard.el b/style/harvard.el
index b1f12bc..d0a37cb 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -104,7 +104,8 @@
 
     ;; Tell RefTeX
     (when (fboundp 'reftex-set-cite-format)
-      (reftex-set-cite-format 'harvard)))))
+      (reftex-set-cite-format 'harvard))))
+ LaTeX-dialect)
 
 (defun LaTeX-env-harvardbib (environment &optional ignore)
   "Insert ENVIRONMENT with label for harvarditem."
diff --git a/style/hyperref.el b/style/hyperref.el
index bfd47a4..ad1c628 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -226,7 +226,8 @@
 
    ;; RefTeX
    (when (fboundp 'reftex-ref-style-activate)
-     (reftex-ref-style-activate "Hyperref"))))
+     (reftex-ref-style-activate "Hyperref")))
+ LaTeX-dialect)
 
 (defun LaTeX-hyperref-package-options ()
   "Read the hyperref package options from the user."
diff --git a/style/icelandic.el b/style/icelandic.el
index f7750dd..427a88d 100644
--- a/style/icelandic.el
+++ b/style/icelandic.el
@@ -48,6 +48,7 @@
    (when (fboundp 'font-latex-add-quotes)
      (font-latex-add-quotes '("\"`" "\"'"))
      (font-latex-add-quotes '("\"<" "\">" french)))
-   (run-hooks 'TeX-language-is-hook)))
+   (run-hooks 'TeX-language-is-hook))
+ LaTeX-dialect)
 
 ;;; icelandic.el ends here
diff --git a/style/imakeidx.el b/style/imakeidx.el
index f82d335..d361cbd 100644
--- a/style/imakeidx.el
+++ b/style/imakeidx.el
@@ -89,7 +89,8 @@
          '(("|see{\([^{}

]*\)" 1 LaTeX-index-entry-list))
          TeX-complete-list))
    (and (fboundp 'reftex-add-index-macros)
-       (reftex-add-index-macros '(default)))))
+       (reftex-add-index-macros '(default))))
+ LaTeX-dialect)
 
 (defvar LaTeX-imakeidx-package-options
   '("makeindex" "xindy" "texindy" "truexindy" "noautomatic" "nonewpage" "quiet"
diff --git a/style/index.el b/style/index.el
index f14630b..66e52da 100644
--- a/style/index.el
+++ b/style/index.el
@@ -75,7 +75,8 @@
 
     ;; RefTeX support
     (and (fboundp 'reftex-add-index-macros)
-        (reftex-add-index-macros '(index)))))
+        (reftex-add-index-macros '(index))))
+  LaTeX-dialect)
 
 (defvar LaTeX-index-package-options nil
   "Package options for the index package.")
diff --git a/style/inputenc.el b/style/inputenc.el
index 8b7be5c..7d00ca7 100644
--- a/style/inputenc.el
+++ b/style/inputenc.el
@@ -77,7 +77,8 @@
  (lambda ()
    ;; New symbols
    (TeX-add-symbols
-    '("inputencoding" LaTeX-arg-inputenc-inputenc))))
+    '("inputencoding" LaTeX-arg-inputenc-inputenc)))
+ LaTeX-dialect)
 
 ;; Local Variables:
 ;; coding: iso-8859-1
diff --git a/style/italian.el b/style/italian.el
index 4578f6f..a7fa3d9 100644
--- a/style/italian.el
+++ b/style/italian.el
@@ -54,6 +54,7 @@
    ;; Fontification of quotation marks.
    (when (fboundp 'font-latex-add-quotes)
      (font-latex-add-quotes '("\"<" "\">" french)))
-   (run-hooks 'TeX-language-it-hook)))
+   (run-hooks 'TeX-language-it-hook))
+ LaTeX-dialect)
 
 ;;; italian.el ends here
diff --git a/style/j-article.el b/style/j-article.el
index bf0b790..5a26de5 100644
--- a/style/j-article.el
+++ b/style/j-article.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "j-article"
  (lambda ()
-   (LaTeX-largest-level-set "section")))
+   (LaTeX-largest-level-set "section"))
+ LaTeX-dialect)
 
 ;;; j-article.el ends here
diff --git a/style/j-book.el b/style/j-book.el
index 82db61e..932fe45 100644
--- a/style/j-book.el
+++ b/style/j-book.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "j-book"
  (lambda ()
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 
 ;;; j-book.el ends here
diff --git a/style/j-report.el b/style/j-report.el
index a70da4f..07dfcb5 100644
--- a/style/j-report.el
+++ b/style/j-report.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "j-report"
  (lambda ()
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 
 ;;; j-report.el ends here
diff --git a/style/jarticle.el b/style/jarticle.el
index 98d3ae0..5d38668 100644
--- a/style/jarticle.el
+++ b/style/jarticle.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "jarticle"
  (lambda ()
-   (LaTeX-largest-level-set "section")))
+   (LaTeX-largest-level-set "section"))
+ LaTeX-dialect)
 
 ;;; jarticle.el ends here
diff --git a/style/jbook.el b/style/jbook.el
index 0200200..beb8748 100644
--- a/style/jbook.el
+++ b/style/jbook.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "jbook"
  (lambda ()
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 
 ;;; jbook.el ends here
diff --git a/style/jreport.el b/style/jreport.el
index 8bf93cf..751ecc1 100644
--- a/style/jreport.el
+++ b/style/jreport.el
@@ -5,7 +5,8 @@
 (TeX-add-style-hook
  "jreport"
  (lambda ()
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 
 
 ;;; jreport.el ends here
diff --git a/style/jsarticle.el b/style/jsarticle.el
index 2c8755d..9e50fbb 100644
--- a/style/jsarticle.el
+++ b/style/jsarticle.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "jsarticle"
  (lambda ()
-   (LaTeX-largest-level-set "section")))
+   (LaTeX-largest-level-set "section"))
+ LaTeX-dialect)
 
 ;;; jsarticle.el ends here
diff --git a/style/jsbook.el b/style/jsbook.el
index 0505861..fae2713 100644
--- a/style/jsbook.el
+++ b/style/jsbook.el
@@ -5,6 +5,7 @@
 (TeX-add-style-hook
  "jsbook"
  (lambda () 
-   (LaTeX-largest-level-set "chapter")))
+   (LaTeX-largest-level-set "chapter"))
+ LaTeX-dialect)
 
 ;;; jsbook.el ends here
diff --git a/style/jura.el b/style/jura.el
index 2f149c4..4baac97 100644
--- a/style/jura.el
+++ b/style/jura.el
@@ -32,7 +32,8 @@
 (TeX-add-style-hook
  "jura"
  (lambda ()
-   (TeX-run-style-hooks "alphanum")))
+   (TeX-run-style-hooks "alphanum"))
+ LaTeX-dialect)
 
 ;; Local Variables:
 ;; coding: iso-8859-1
diff --git a/style/jurabib.el b/style/jurabib.el
index c48e383..1919c06 100644
--- a/style/jurabib.el
+++ b/style/jurabib.el
@@ -629,6 +629,7 @@
     "urldatecomment"
     "volname"
     "volumename"
-    "volumeofname")))
+    "volumeofname"))
+ LaTeX-dialect)
 
 ;;; jurabib.el ends here
diff --git a/style/kantlipsum.el b/style/kantlipsum.el
index 395fceb..cdf510f 100644
--- a/style/kantlipsum.el
+++ b/style/kantlipsum.el
@@ -36,7 +36,8 @@
     '("kant" [ "Range of paragraph (max: 164)" ])
     '("kant*" [ "Range of paragraph (max: 164)" ])
     '("kantdef" TeX-arg-define-macro "Paragraph number"))
-   (TeX-run-style-hooks "xparse")))
+   (TeX-run-style-hooks "xparse"))
+ LaTeX-dialect)
 
 (defvar LaTeX-kantlipsum-package-options
   '("par" "nopar" "numbers" "index")
diff --git a/style/kpfonts.el b/style/kpfonts.el
index a93ba36..026c81f 100644
--- a/style/kpfonts.el
+++ b/style/kpfonts.el
@@ -570,7 +570,8 @@ following commands are defined:
                              'bold-declaration)
      (font-latex-add-keywords '(("scslshape")
                                ("otherscslshape"))
-                             'italic-declaration))))
+                             'italic-declaration)))
+ LaTeX-dialect)
 
 (defvar LaTeX-kpfonts-package-options
   '(;; Main global options
diff --git a/style/latexinfo.el b/style/latexinfo.el
index 18e8965..be64bca 100644
--- a/style/latexinfo.el
+++ b/style/latexinfo.el
@@ -175,6 +175,7 @@ This fails when the user types in the label of something 
else"
 
     ;; need the following stuff to let xref and pxref work
     (make-local-variable 'LaTeX-section-label)
-    (setq LaTeX-section-label ""))))
+    (setq LaTeX-section-label "")))
+ LaTeX-dialect)
 
 ;;; latexinfo.el ends here
diff --git a/style/letter.el b/style/letter.el
index a5bbc71..d02f8f4 100644
--- a/style/letter.el
+++ b/style/letter.el
@@ -80,7 +80,8 @@
                                ("cc" "{")
                                ("encl" "{")
                                ("ps" "{"))
-                             'function))))
+                             'function)))
+ LaTeX-dialect)
 
 (defun LaTeX-env-recipient (environment)
   "Insert ENVIRONMENT and prompt for recipient and address."
diff --git a/style/lettrine.el b/style/lettrine.el
index f595c43..ed32a70 100644
--- a/style/lettrine.el
+++ b/style/lettrine.el
@@ -66,7 +66,8 @@
    ;; Fontification
    (when (and (fboundp 'font-latex-add-keywords)
               (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("lettrine" "[{{")) 'textual))))
+     (font-latex-add-keywords '(("lettrine" "[{{")) 'textual)))
+ LaTeX-dialect)
 
 (defvar LaTeX-lettrine-package-options nil
   "Package options for the lettrine package.")
diff --git a/style/lipsum.el b/style/lipsum.el
index a0c0c04..e198480 100644
--- a/style/lipsum.el
+++ b/style/lipsum.el
@@ -36,7 +36,8 @@
     '("lipsum" [ "Range of paragraph (max: 150)" ])
     '("lipsum*" [ "Range of paragraph (max: 150)" ])
     '("setlipsumdefault" [ "Default range of paragraph (max: 150)" ])
-    '("ChangeLipsumPar" 0))))
+    '("ChangeLipsumPar" 0)))
+ LaTeX-dialect)
 
 (defvar LaTeX-lipsum-package-options
   '("nopar")
diff --git a/style/listings.el b/style/listings.el
index 82ebd71..534de62 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -271,7 +271,8 @@
      (font-latex-set-syntactic-keywords)
      ;; Tell font-lock about the update.
      (setq font-lock-set-defaults nil)
-     (font-lock-set-defaults))))
+     (font-lock-set-defaults)))
+ LaTeX-dialect)
 
 (defvar LaTeX-listings-package-options '("draft" "final" "savemem" 
                                         "noaspects"
diff --git a/style/longtable.el b/style/longtable.el
index 7b5ae00..c0c7cf4 100644
--- a/style/longtable.el
+++ b/style/longtable.el
@@ -88,6 +88,7 @@
      ;; argument, not an optional one, the following is a workaround
      ;; to fontify correctly also the standard `

_______________________________________________
auctex-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/auctex-devel

Reply via email to