[elpa] elpa 8c6f901 48/51: Append environment indentation rules to LaTeX-indent-environment-list

[Tassilo Horn]

branch: elpa
commit 8c6f901294ca75a624b4febc1004690a1e02b053
Author: Mosè Giordano <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Append environment indentation rules to LaTeX-indent-environment-list
    
    * style/alltt.el ("alltt"): Append indentation rule to
      `LaTeX-indent-environment-list' in order not to override custom
      settings.  Reported by François Patte.
    * style/beamer.el ("beamer"): Ditto.
    * style/doc.el ("doc"): Ditto.
    * style/fancyvrb.el ("fancyvrb"): Ditto.
    * style/filecontents.el ("filecontents"): Ditto.
    * style/hyperref.el ("hyperref"): Ditto.
    * style/listings.el (LaTeX-listings-auto-cleanup, "listings"): Ditto.
    * style/longtable.el ("longtable"): Ditto.
    * style/minted.el (LaTeX-minted-auto-cleanup, "minted"): Ditto.
    * style/tabularx.el ("tabularx"): Ditto.
    * style/tabulary.el ("tabulary"): Ditto.
---
 style/alltt.el        |    7 +++----
 style/beamer.el       |    7 +++----
 style/currvita.el     |    2 +-
 style/doc.el          |    6 +++---
 style/fancyvrb.el     |   14 +++++++-------
 style/filecontents.el |    6 +++---
 style/hyperref.el     |    7 ++++---
 style/listings.el     |    9 ++++-----
 style/longtable.el    |   11 ++++++-----
 style/minted.el       |   11 +++++------
 style/tabularx.el     |    9 +++++----
 style/tabulary.el     |    7 ++++---
 12 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/style/alltt.el b/style/alltt.el
index 86b4993..ccb6ac9 100644
--- a/style/alltt.el
+++ b/style/alltt.el
@@ -1,6 +1,6 @@
 ;;; alltt.el --- AUCTeX style for `alltt.sty'
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2014, 2016 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -34,9 +34,8 @@
  "alltt"
  (lambda ()
    (LaTeX-add-environments "alltt")
-   (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list
-               '("alltt" current-indentation))
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
+               '("alltt" current-indentation) t)
    (add-to-list 'LaTeX-verbatim-environments-local "alltt")
    ;; Fontification
    (when (and (featurep 'font-latex)
diff --git a/style/beamer.el b/style/beamer.el
index 30cb328..b9e5953 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,6 +1,6 @@
 ;;; beamer.el --- AUCTeX style for the latex-beamer class
 
-;; Copyright (C) 2003, 2004, 2005, 2008, 2013, 2014 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2008, 2013-2016 Free Software Foundation
 
 ;; Author: Thomas Baumann <address@hidden>
 ;; Created: 2003-12-20
@@ -169,9 +169,8 @@
                       "subsectionslide" "framenumber" "figure" "table"
                       "beamerpauses")
    (LaTeX-add-pagestyles "navigation")
-   (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list
-               '("semiverbatim" current-indentation))
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
+               '("semiverbatim" current-indentation) t)
    (add-to-list 'LaTeX-verbatim-environments-local "semiverbatim")
 
    ;; Fontification
diff --git a/style/currvita.el b/style/currvita.el
index a008753..bc6872d 100644
--- a/style/currvita.el
+++ b/style/currvita.el
@@ -1,6 +1,6 @@
 ;;; currvita.el --- AUCTeX style for `currvita.sty' (v0.9i)
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <esbati'at'gmx.de>
 ;; Maintainer: address@hidden
diff --git a/style/doc.el b/style/doc.el
index 6c98d66..57b3ee9 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -64,11 +64,11 @@
  "doc"
  (lambda ()
    (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
-               '("macrocode" current-indentation))
+               '("macrocode" current-indentation) t)
    (add-to-list 'LaTeX-indent-environment-list
-               '("macrocode*" current-indentation))
+               '("macrocode*" current-indentation) t)
    (add-to-list 'LaTeX-indent-environment-list
-               '("macro" current-indentation))
+               '("macro" current-indentation) t)
    (add-hook 'LaTeX-after-insert-env-hooks 'LaTeX-doc-after-insert-macrocode
             nil t)
    (LaTeX-add-environments
diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index 8334708..3404365 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -1,9 +1,9 @@
 ;;; fancyvrb.el --- AUCTeX style for `fancyvrb.sty' version 2.8.
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2014, 2016 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
-;; Author: Mosè Giordano <address@hidden>
+;; Author: Mosè Giordano <address@hidden>
 ;; Keywords: tex
 
 ;; This file is part of AUCTeX.
@@ -165,11 +165,11 @@
    (add-to-list 'LaTeX-verbatim-environments-local "SaveVerbatim")
    (add-to-list 'LaTeX-verbatim-environments-local "VerbatimOut")
    (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list '("Verbatim" 
current-indentation))
-   (add-to-list 'LaTeX-indent-environment-list '("BVerbatim" 
current-indentation))
-   (add-to-list 'LaTeX-indent-environment-list '("LVerbatim" 
current-indentation))
-   (add-to-list 'LaTeX-indent-environment-list '("SaveVerbatim" 
current-indentation))
-   (add-to-list 'LaTeX-indent-environment-list '("VerbatimOut" 
current-indentation))
+   (add-to-list 'LaTeX-indent-environment-list '("Verbatim" 
current-indentation) t)
+   (add-to-list 'LaTeX-indent-environment-list '("BVerbatim" 
current-indentation) t)
+   (add-to-list 'LaTeX-indent-environment-list '("LVerbatim" 
current-indentation) t)
+   (add-to-list 'LaTeX-indent-environment-list '("SaveVerbatim" 
current-indentation) t)
+   (add-to-list 'LaTeX-indent-environment-list '("VerbatimOut" 
current-indentation) t)
    (add-to-list 'LaTeX-verbatim-macros-with-delims-local "Verb")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "Verb")
 
diff --git a/style/filecontents.el b/style/filecontents.el
index 256c214..639e1f4 100644
--- a/style/filecontents.el
+++ b/style/filecontents.el
@@ -1,6 +1,6 @@
 ;;; filecontents.el --- AUCTeX style for `filecontents.sty'
 
-;; Copyright (C) 2013--2015 Free Software Foundation, Inc.
+;; Copyright (C) 2013--2016 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <address@hidden>
 ;; Maintainer: address@hidden
@@ -42,9 +42,9 @@
 
    (make-local-variable 'LaTeX-indent-environment-list)
    (add-to-list 'LaTeX-indent-environment-list
-               '("filecontents" current-indentation))
+               '("filecontents" current-indentation) t)
    (add-to-list 'LaTeX-indent-environment-list
-               '("filecontents*" current-indentation)))
+               '("filecontents*" current-indentation) t))
  LaTeX-dialect)
 
 (defun LaTeX-env-filecontents (environment)
diff --git a/style/hyperref.el b/style/hyperref.el
index c57c188..973796a 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -267,10 +267,11 @@
    (LaTeX-add-environments
     '("Form"))
 
-   ;; Do not indent the content of the "Form"-env; it is odd if the
-   ;; whole document is indented.
+   ;; Do not indent the content of the "Form"-env; it is odd if the whole
+   ;; document is indented.  Append to `LaTeX-indent-environment-list' in order
+   ;; not to override custom settings.
    (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list '("Form" current-indentation))
+   (add-to-list 'LaTeX-indent-environment-list '("Form" current-indentation) t)
 
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "nolinkurl")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperbaseurl")
diff --git a/style/listings.el b/style/listings.el
index 0dff6ec..2d50b2c 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -1,6 +1,6 @@
 ;;; listings.el --- AUCTeX style for `listings.sty'
 
-;; Copyright (C) 2004, 2005, 2009, 2013, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2009, 2013-2016 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -290,7 +290,7 @@ with user-defined values via the \"lstdefinestyle\" macro."
                          (list env (string-to-number args))))
            (t ; No args
             (add-to-list 'LaTeX-auto-environment (list env))))
-      (add-to-list 'LaTeX-indent-environment-list `(,env current-indentation))
+      (add-to-list 'LaTeX-indent-environment-list `(,env current-indentation) 
t)
       (add-to-list 'LaTeX-verbatim-environments-local env)))
   (when (LaTeX-listings-lstdefinestyle-list)
     (LaTeX-listings-update-style-key)))
@@ -342,9 +342,8 @@ with user-defined values via the \"lstdefinestyle\" macro."
     '("lstlisting" LaTeX-env-args
       [TeX-arg-key-val LaTeX-listings-key-val-options-local]))
    ;; Filling
-   (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list
-               '("lstlisting" current-indentation))
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
+               '("lstlisting" current-indentation) t)
    (add-to-list 'LaTeX-verbatim-environments-local "lstlisting")
    (add-to-list 'LaTeX-verbatim-macros-with-delims-local "lstinline")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "lstinline")
diff --git a/style/longtable.el b/style/longtable.el
index 7401c8d..a9659dc 100644
--- a/style/longtable.el
+++ b/style/longtable.el
@@ -1,9 +1,9 @@
 ;;; longtable.el --- AUCTeX style for `longtable.sty'.
 
-;; Copyright (C) 2013--2015  Free Software Foundation, Inc.
+;; Copyright (C) 2013--2016  Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
-;; Author: Mosè Giordano <address@hidden>
+;; Author: Mosè Giordano <address@hidden>
 ;; Keywords: tex
 
 ;; This file is part of AUCTeX.
@@ -75,9 +75,10 @@
    ;; This parameter is set with \setcounter
    (LaTeX-add-counters "LTchunksize")
 
-   ;; Use the enhanced table formatting
-   (add-to-list 'LaTeX-indent-environment-list
-               '("longtable" LaTeX-indent-tabular))
+   ;; Use the enhanced table formatting.  Append to
+   ;; `LaTeX-indent-environment-list' in order not to override custom settings.
+   (add-to-list (make-variable-buffer-local 'LaTeX-indent-environment-list)
+               '("longtable" LaTeX-indent-tabular) t)
 
    ;; Append longtable to `LaTeX-label-alist', in order not to override 
possible
    ;; custome values.
diff --git a/style/minted.el b/style/minted.el
index d829e93..a4f413d 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -1,6 +1,6 @@
 ;;; minted.el --- AUCTeX style for `minted.sty'
 
-;; Copyright (C) 2014, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
 
 ;; Author: Tassilo Horn <address@hidden>
 ;; Maintainer: address@hidden
@@ -141,8 +141,8 @@
       (add-to-list 'LaTeX-auto-environment
                   (list env* 'LaTeX-env-args
                         '(TeX-arg-key-val LaTeX-minted-key-val-options)))
-      (add-to-list 'LaTeX-indent-environment-list `(,env current-indentation))
-      (add-to-list 'LaTeX-indent-environment-list `(,env* current-indentation))
+      (add-to-list 'LaTeX-indent-environment-list `(,env current-indentation) 
t)
+      (add-to-list 'LaTeX-indent-environment-list `(,env* current-indentation) 
t)
       (add-to-list 'LaTeX-verbatim-environments-local env)
       (add-to-list 'LaTeX-verbatim-environments-local env*)))
   ;; \newmint{foo}{opts} => \foo|code|
@@ -210,9 +210,8 @@
    (TeX-auto-add-regexp LaTeX-minted-newmintedfile-regexp)
 
    ;; Filling
-   (make-local-variable 'LaTeX-indent-environment-list)
-   (add-to-list 'LaTeX-indent-environment-list
-               '("minted" current-indentation))
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
+               '("minted" current-indentation) t)
    (add-to-list 'LaTeX-verbatim-environments-local "minted")
    ;; FIXME: That doesn't work because \mintinline has 2 args and only the
    ;; second argument is verbatim.
diff --git a/style/tabularx.el b/style/tabularx.el
index 5cfebc8..63a1272 100644
--- a/style/tabularx.el
+++ b/style/tabularx.el
@@ -1,6 +1,6 @@
 ;;; tabularx.el --- AUCTeX style for the tabularx package.
 
-;; Copyright (C) 2009, 2013, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2013-2016 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -39,9 +39,10 @@
  (lambda ()
    ;; Make tabularx the default tabular environment
    (setq LaTeX-default-tabular-environment "tabularx")
-   ;; Use the enhanced tabular indentation
-   (add-to-list 'LaTeX-indent-environment-list
-               '("tabularx" LaTeX-indent-tabular))
+   ;; Use the enhanced tabular indentation.  Append to
+   ;; `LaTeX-indent-environment-list' in order not to override custom settings.
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
+               '("tabularx" LaTeX-indent-tabular) t)
    ;; New symbols
    (TeX-add-symbols
     "tracingtabularx"
diff --git a/style/tabulary.el b/style/tabulary.el
index 30e3a64..289401e 100644
--- a/style/tabulary.el
+++ b/style/tabulary.el
@@ -1,6 +1,6 @@
 ;;; tabulary.el --- AUCTeX style for the tabulary package.
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <address@hidden>
 ;; Maintainer: address@hidden
@@ -39,8 +39,9 @@
  (lambda ()
    ;; Make tabulary the default tabular environment
    (setq LaTeX-default-tabular-environment "tabulary")
-   ;; Use the enhanced tabular indentation
-   (add-to-list 'LaTeX-indent-environment-list
+   ;; Use the enhanced tabular indentation.  Append to
+   ;; `LaTeX-indent-environment-list' in order not to override custom settings.
+   (add-to-list (make-local-variable 'LaTeX-indent-environment-list)
                '("tabulary" LaTeX-indent-tabular))
    ;; New symbols
    (TeX-add-symbols