summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-09-29 14:14:08 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-09-29 14:14:08 -0400
commitcbdc06f3be1fb1921454d15d5d9f48bef85cba9e (patch)
treeeadcc7cd3232cc8f8ac5789d5ef48cc69796a19c /lisp/emacs-lisp
parent8f24b587c87f621f5bc9997589de5d4e3f73b1c3 (diff)
Rename 24.5 to 25.1
Except where we expect to backport the corresponding change.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eldoc.el2
-rw-r--r--lisp/emacs-lisp/subr-x.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 9e15375d92..7245989c4b 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -88,7 +88,7 @@ has no effect, unless the function handles it explicitly."
(function-item downcase)
function)
:group 'eldoc)
-(make-obsolete-variable 'eldoc-argument-case nil "24.5")
+(make-obsolete-variable 'eldoc-argument-case nil "25.1")
(defcustom eldoc-echo-area-use-multiline-p 'truncate-sym-name-if-fit
"Allow long ElDoc messages to resize echo area display.
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 062743a74f..759760c7d6 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -159,7 +159,7 @@ to bind a single value, BINDINGS can just be a plain tuple."
"Join all STRINGS using SEPARATOR."
(mapconcat 'identity strings separator))
-(define-obsolete-function-alias 'string-reverse 'reverse "24.5")
+(define-obsolete-function-alias 'string-reverse 'reverse "25.1")
(defsubst string-trim-left (string)
"Remove leading whitespace from STRING."