aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-10-06 13:33:23 -0700
committerGlenn Morris2012-10-06 13:33:23 -0700
commit18dec75063c85fac15822929827356f7cdfc5b2d (patch)
tree45e18b68be3551cd1cf01a64399478270b6206ed
parentd1a1c7e649e0ad44f1426abce72a5ff45a07e8fc (diff)
downloademacs-18dec75063c85fac15822929827356f7cdfc5b2d.tar.gz
emacs-18dec75063c85fac15822929827356f7cdfc5b2d.zip
Clarify some rst.el obsolescence versions
* lisp/textmodes/rst.el (rst-preferred-decorations) (rst-shift-basic-offset): Clarify obsolescence versions.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/rst.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 861038b17bd..53e38365b00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-10-06 Glenn Morris <rgm@gnu.org> 12012-10-06 Glenn Morris <rgm@gnu.org>
2 2
3 * textmodes/rst.el (rst-preferred-decorations)
4 (rst-shift-basic-offset): Clarify obsolescence versions.
5
3 * profiler.el (profiler): Add missing group :version tag. 6 * profiler.el (profiler): Add missing group :version tag.
4 * avoid.el (mouse-avoidance-banish-position): 7 * avoid.el (mouse-avoidance-banish-position):
5 * proced.el (proced-renice-command): 8 * proced.el (proced-renice-command):
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 202c36c2e4a..02bb1e6371f 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -967,7 +967,7 @@ for modes derived from Text mode, like Mail mode."
967 :version "21.1") 967 :version "21.1")
968 968
969(define-obsolete-variable-alias 969(define-obsolete-variable-alias
970 'rst-preferred-decorations 'rst-preferred-adornments "1.0.0") 970 'rst-preferred-decorations 'rst-preferred-adornments "rst 1.0.0")
971(defcustom rst-preferred-adornments '((?= over-and-under 1) 971(defcustom rst-preferred-adornments '((?= over-and-under 1)
972 (?= simple 0) 972 (?= simple 0)
973 (?- simple 0) 973 (?- simple 0)
@@ -2836,7 +2836,7 @@ here."
2836 :package-version '(rst . "1.1.0")) 2836 :package-version '(rst . "1.1.0"))
2837 2837
2838(define-obsolete-variable-alias 2838(define-obsolete-variable-alias
2839 'rst-shift-basic-offset 'rst-indent-width "1.0.0") 2839 'rst-shift-basic-offset 'rst-indent-width "rst 1.0.0")
2840(defcustom rst-indent-width 2 2840(defcustom rst-indent-width 2
2841 "Indentation when there is no more indentation point given." 2841 "Indentation when there is no more indentation point given."
2842 :group 'rst-indent 2842 :group 'rst-indent