[elpa] 232/299: Fix some FIXMEs.

[Stefan Monnier]

monnier pushed a commit to branch externals/auctex
in repository elpa.

commit e18e745a2c1ba27f87be0b85c86449dc04f58c37
Author: Mosè Giordano <address@hidden>
Date:   Sat Mar 15 11:56:20 2014 +0100

    Fix some FIXMEs.
    
    * style/paralist.el: Update copyright years.
    ("paralist"): Use `LaTeX-provided-package-options-member' to
    conditionally define environments.
---
 ChangeLog         |    6 ++++++
 style/paralist.el |   26 ++++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f61eda..ab2c75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-15  Mos� Giordano  <address@hidden>
+
+       * style/paralist.el: Update copyright years.
+       ("paralist"): Use `LaTeX-provided-package-options-member' to
+       conditionally define environments.
+
 2014-03-12  Tassilo Horn  <address@hidden>
 
        * multi-prompt.el (multi-prompt): Return nil on empty input.
diff --git a/style/paralist.el b/style/paralist.el
index a004d3c..61b50ac 100644
--- a/style/paralist.el
+++ b/style/paralist.el
@@ -1,6 +1,6 @@
 ;;; paralist.el -- AUCTeX style for paralist.sty
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2014 Free Software Foundation, Inc.
 
 ;; Author:   Ralf Angeli <address@hidden>
 ;; Maintainer: address@hidden
@@ -72,17 +72,19 @@
     '("asparaitem" LaTeX-paralist-env-item-opt-label)
     '("inparaitem" LaTeX-paralist-env-item-opt-label)
     '("compactitem" LaTeX-paralist-env-item-opt-label)
-    '("compactdesc" LaTeX-env-item)
-    ;; FIXME: Should not be available if package is loaded with option
-    ;; `olditem':
-    '("itemize" LaTeX-paralist-env-item-opt-label)
-    ;; FIXME: Should not be available if package is loaded with option
-    ;; `oldenum':
-    '("enumerate" LaTeX-paralist-env-item-opt-label)
-    ;; FIXME: Only defined if package is loaded with option
-    ;; `defblank':
-    '("asparablank" LaTeX-env-item)
-    '("inparablank" LaTeX-env-item))
+    '("compactdesc" LaTeX-env-item))
+   ;; Environments (re)defined only when the package is loaded with particular
+   ;; options.
+   (unless (LaTeX-provided-package-options-member "paralist" "olditem")
+     (LaTeX-add-environments
+      '("itemize" LaTeX-paralist-env-item-opt-label)))
+   (unless (LaTeX-provided-package-options-member "paralist" "oldenum")
+     (LaTeX-add-environments
+      '("enumerate" LaTeX-paralist-env-item-opt-label)))
+   (when (LaTeX-provided-package-options-member "paralist" "defblank")
+     (LaTeX-add-environments
+      '("asparablank" LaTeX-env-item)
+      '("inparablank" LaTeX-env-item)))
 
    ;; Fontification
    (when (and (featurep 'font-latex)