merge trunk

2 files changed, 16 insertions, 6 deletions

diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index df3d729adca..2c1fc972057 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -968,6 +968,7 @@ the macro type is being prompted for.  (See also
 `reftex-ref-macro-prompt'.)  The keys, represented as characters,
 have to be unique."
   :group 'reftex-referencing-labels
+  :version "24.3"
   :type '(alist :key-type (string :tag "Style name")
                 :value-type (group (choice :tag "Package"
                                            (const :tag "Any package" t)
@@ -979,6 +980,7 @@ have to be unique."
 (defcustom reftex-ref-macro-prompt t
   "If non-nil, `reftex-reference' prompts for the reference macro."
   :group 'reftex-referencing-labels
+  :version "24.3"
   :type 'boolean)
 
 (defcustom reftex-vref-is-default nil
@@ -1014,6 +1016,7 @@ can be cycled in the buffer for selecting a label.  The entries
 in the list have to match the respective reference style names
 used in the variable `reftex-ref-style-alist'."
   :group 'reftex-referencing-labels
+  :version "24.3"
   :type `(set ,@(mapcar (lambda (x) (list 'const (car x)))
                         reftex-ref-style-alist)))
 
@@ -1257,17 +1260,20 @@ should return the string to insert into the buffer."
 (defcustom reftex-cite-key-separator ","
   "String to be used for separating several keys in a \\cite macro."
   :group 'reftex-citation-support
+  :version "24.3"
   :type 'string)
 
 (defcustom reftex-create-bibtex-header nil
   "Header to insert in BibTeX files generated by RefTeX."
   :group 'reftex-citation-support
-  :type 'string)
+  :version "24.3"
+  :type '(choice (const :tag "No header" nil) string))
 
 (defcustom reftex-create-bibtex-footer nil
   "Footer to insert in BibTeX files generated by RefTeX."
   :group 'reftex-citation-support
-  :type 'string)
+  :version "24.3"
+  :type '(choice (const :tag "No footer" nil) string))
 
 ;; Index Support Configuration
 
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 869da63064a..f2c74dfb941 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -218,7 +218,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
 ;; Use CVSHeader to really get information from CVS and not other version
 ;; control systems.
 (defconst rst-cvs-header
-  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.2 2012-09-23 14:44:25 stefan Exp $")
+  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.5 2012-10-07 12:44:34 stefan Exp $")
 (defconst rst-cvs-rev
   (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+"
                        " .*" rst-cvs-header "0.0")
@@ -247,7 +247,7 @@ SVN revision is the upstream (docutils) revision.")
   "Official version of the package.")
 (defconst rst-official-cvs-rev
   (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
-                       "$Revision: 1.327.2.2 $")
+                       "$Revision: 1.327.2.5 $")
   "CVS revision of this file in the official version.")
 
 (defconst rst-version
@@ -967,7 +967,7 @@ for modes derived from Text mode, like Mail mode."
   :version "21.1")
 
 (define-obsolete-variable-alias
-  'rst-preferred-decorations 'rst-preferred-adornments "1.0.0")
+  'rst-preferred-decorations 'rst-preferred-adornments "rst 1.0.0")
 (defcustom rst-preferred-adornments '((?= over-and-under 1)
                                       (?= simple 0)
                                       (?- simple 0)
@@ -2835,7 +2835,7 @@ here."
   :package-version '(rst . "1.1.0"))
 
 (define-obsolete-variable-alias
-  'rst-shift-basic-offset 'rst-indent-width "1.0.0")
+  'rst-shift-basic-offset 'rst-indent-width "rst 1.0.0")
 (defcustom rst-indent-width 2
   "Indentation when there is no more indentation point given."
   :group 'rst-indent
@@ -2845,24 +2845,28 @@ here."
 (defcustom rst-indent-field 3
   "Indentation for first line after a field or 0 to always indent for content."
   :group 'rst-indent
+  :package-version '(rst . "1.1.0")
   :type '(integer))
 (rst-testcover-defcustom)
 
 (defcustom rst-indent-literal-normal 3
   "Default indentation for literal block after a markup on an own line."
   :group 'rst-indent
+  :package-version '(rst . "1.1.0")
   :type '(integer))
 (rst-testcover-defcustom)
 
 (defcustom rst-indent-literal-minimized 2
   "Default indentation for literal block after a minimized markup."
   :group 'rst-indent
+  :package-version '(rst . "1.1.0")
   :type '(integer))
 (rst-testcover-defcustom)
 
 (defcustom rst-indent-comment 3
   "Default indentation for first line of a comment."
   :group 'rst-indent
+  :package-version '(rst . "1.1.0")
   :type '(integer))
 (rst-testcover-defcustom)