Rename 24.5 to 25.1

Except where we expect to backport the corresponding change.

34 files changed, 59 insertions, 60 deletions

diff --git a/etc/NEWS b/etc/NEWS
index f8f7887b4df..6f9bf83a8b1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -22,7 +22,7 @@ When you add a new item, use the appropriate mark if you are sure it applies,
 otherwise leave it unmarked.
 
 
-* Installation Changes in Emacs 24.5
+* Installation Changes in Emacs 25.1
 
 +++
 ** Building Emacs now requires C99 or later.
@@ -44,10 +44,10 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 'make V=0' now do a better job of suppressing chatter.
 
 
-* Startup Changes in Emacs 24.5
+* Startup Changes in Emacs 25.1
 
 
-* Changes in Emacs 24.5
+* Changes in Emacs 25.1
 
 ** `insert-register' now leaves point after the inserted text
 when called interactively.  A prefix argument toggles this behavior.
@@ -90,7 +90,7 @@ codeset is "UTF-8" (as in "en_US.UTF-8").  This is needed because
 MS-Windows doesn't support UTF-8 as codeset in its locales.
 
 
-* Editing Changes in Emacs 24.5
+* Editing Changes in Emacs 25.1
 
 ** Emacs now supports "bracketed paste mode" when running on a terminal
 that supports it.  This facility allows Emacs to understand pasted
@@ -100,7 +100,7 @@ paste experience similar to that under a window system, and significant
 performance improvements when pasting large amounts of text.
 
 
-* Changes in Specialized Modes and Packages in Emacs 24.5
+* Changes in Specialized Modes and Packages in Emacs 25.1
 
 ** ElDoc
 *** New minor mode global-eldoc-mode
@@ -216,10 +216,10 @@ These emulations of old editors are believed to be no longer relevant
 *** vi.el, vip.el (try M-x viper instead)
 
 
-* New Modes and Packages in Emacs 24.5
+* New Modes and Packages in Emacs 25.1
 
 
-* Incompatible Lisp Changes in Emacs 24.5
+* Incompatible Lisp Changes in Emacs 25.1
 
 ** window-configurations no longer record the buffers's marks.
 
@@ -240,7 +240,7 @@ These slots used to hold key-shortcut data, but have been obsolete since
 Emacs-21.
 
 
-* Lisp Changes in Emacs 24.5
+* Lisp Changes in Emacs 25.1
 
 *** call-process-shell-command and process-file-shell-command
 don't take "&rest args" any more.
@@ -277,7 +277,7 @@ optional repeat-count argument.
     as the first or last argument of subsequent forms.
 
 
-* Changes in Frames and Windows Code in Emacs 24.5
+* Changes in Frames and Windows Code in Emacs 25.1
 
 ** Emacs can now draw horizontal scroll bars on some platforms that
 provide toolkit scroll bars, namely Gtk, Lucid, Motif and Windows.
@@ -311,7 +311,7 @@ fullwidth frames, the behavior may depend on the toolkit used.
    specific frame does not resize that frame in order to preserve the
    number of columns or lines it displays.
 
-* Changes in Emacs 24.5 on Non-Free Operating Systems
+* Changes in Emacs 25.1 on Non-Free Operating Systems
 
 ---
 ** Building Emacs for MS-Windows requires at least Windows XP
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 199b21ecd77..0292561a8ad 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -692,7 +692,7 @@ details, see the documentation for the variable `diary-list-entries-hook'."
   "Symbol indicating a diary entry according to the Chinese calendar."
   :type 'string
   :group 'diary
-  :version "24.5")
+  :version "25.1")
 
 (define-obsolete-variable-alias 'hebrew-diary-entry-symbol
   'diary-hebrew-entry-symbol "23.1")
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 1fffe377954..a07fa1ecaf8 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -250,7 +250,7 @@ on the current day and continues for the number of days given here.
 
 See `icalendar-export-sexp-enumerate-all' for a list of sexp
 entries which by default are NOT enumerated."
-  :version "24.5"
+  :version "25.1"
   :type 'integer
   :group 'icalendar)
 
@@ -263,7 +263,7 @@ translating into an icalendar equivalent.  This affects the
 following sexp diary entries: `diary-anniversary',
 `diary-cyclic', `diary-date', `diary-float',`diary-block'.  All
 other sexp entries are enumerated in any case."
-  :version "24.5"
+  :version "25.1"
   :type 'boolean
   :group 'icalendar)
 
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 9e15375d924..7245989c4b0 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 062743a74f5..759760c7d62 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."
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 37982069abe..39ffbb4bf38 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -151,7 +151,7 @@ the minibuffer."
   "Whether the timestamps should be intangible, i.e. prevent the point
 from entering them and instead jump over them."
   :group 'erc-stamp
-  :version "24.5"
+  :version "25.1"
   :type 'boolean)
 
 (defface erc-timestamp-face '((t :weight bold :foreground "green"))
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 3bb6e8f31c7..cd73c0afa75 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -539,7 +539,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
 
 (defmacro eshell-with-file-modes (modes &rest forms)
   "Evaluate, with file-modes set to MODES, the given FORMS."
-  (declare (obsolete with-file-modes "24.5"))
+  (declare (obsolete with-file-modes "25.1"))
   `(with-file-modes ,modes ,@forms))
 
 (defmacro eshell-with-private-file-modes (&rest forms)
diff --git a/lisp/faces.el b/lisp/faces.el
index d9239d9e1eb..aedd5db72f1 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -53,7 +53,7 @@ This means to treat a terminal of type TYPE as if it were of type ALIAS."
   :type '(alist :key-type (string :tag "Terminal")
 		:value-type (string :tag "Alias"))
   :group 'terminals
-  :version "24.5")
+  :version "25.1")
 
 (declare-function xw-defined-colors "term/common-win" (&optional frame))
 
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 95a651bbde6..e5f574db2de 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -167,7 +167,7 @@ schemes (e.g. \"ftp\"); in that case, only convert those URLs."
   "If non-nil, allow lax URL matching."
   :type 'boolean
   :group 'ffap
-  :version "24.5")
+  :version "25.1")
 
 (defcustom ffap-ftp-default-user "anonymous"
   "User name in FTP file names generated by `ffap-host-to-path'.
diff --git a/lisp/files.el b/lisp/files.el
index 486dee638a9..5d1276f261e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1798,7 +1798,7 @@ When nil, never issue warning.  Beware: This probably doesn't do what you
 think it does, because \"free\" is pretty hard to define in practice."
   :group 'files
   :group 'find-file
-  :version "24.5"
+  :version "25.1"
   :type '(choice integer (const :tag "Never issue warning" nil)))
 
 (defun abort-if-file-too-large (size op-type filename)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index bbfe55c5d84..3b343adb2fd 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5983,7 +5983,7 @@ Since MIME attachments tend to be put at the end of an article, we may
 overlook them if there is a huge body.  This option offers you a copy
 of all non-inlinable MIME parts as buttons shown in front of an article.
 If nil, don't show those extra buttons."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-article-mime
   :type 'boolean)
 
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index f9177377841..8d08cd66463 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -42,19 +42,19 @@
 
 (defcustom gnus-x-face-omit-files nil
   "Regexp to match faces in `gnus-x-face-directory' to be omitted."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'string)
 
 (defcustom gnus-face-directory (expand-file-name "faces" gnus-directory)
   "*Directory where Face PNG files are stored."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'directory)
 
 (defcustom gnus-face-omit-files nil
   "Regexp to match faces in `gnus-face-directory' to be omitted."
-  :version "24.5"
+  :version "25.1"
   :group 'gnus-fun
   :type 'string)
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ca0280c874f..92cab57337c 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -619,7 +619,7 @@ This may also be a list of regexps."
   "If non-nil, delete non-matching headers when forwarding a message.
 Only headers that match this regexp will be included.  This
 variable should be a regexp or a list of regexps."
-  :version "24.5"
+  :version "25.1"
   :group 'message-forwarding
   :type '(repeat :value-to-internal (lambda (widget value)
 				      (custom-split-regexp-maybe value))
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 74290f45469..941b5ecf7c3 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-display-key-image t
   "If t, try to display key images."
-  :version "24.5"
+  :version "25.1"
   :group 'mime-security
   :type 'boolean)
 
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 95933005094..03ee0d25cce 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -128,7 +128,7 @@ Collation Algorithm (UCA), which places together file names that
 differ only in punctuation characters.  On MS-Windows, customize
 the option `ls-lisp-UCA-like-collation' to a non-nil value to get
 similar behavior."
-  :version "24.5"
+  :version "25.1"
   :set-after '(ls-lisp-emulation)
   :type 'boolean
   :group 'ls-lisp)
@@ -150,7 +150,7 @@ and `w32-collate-ignore-punctuation' for more details.
 This option is ignored on platforms other than MS-Windows; to
 control the collation ordering of the file names on those other
 systems, set your locale instead."
-  :version "24.5"
+  :version "25.1"
   :type 'boolean
   :group 'ls-lisp)
 
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index b5b594f59f2..29f7d449a8b 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -139,7 +139,7 @@ automatically display the image in the buffer."
 extracted from message in a temporary buffer.  Converts to text in current 
 buffer. If NIL, display HTML source."
   :group 'rmail
-  :version "24.5"
+  :version "25.1"
   :type '(choice function (const nil)))
 
 (defcustom rmail-mime-prefer-html
@@ -148,7 +148,7 @@ buffer. If NIL, display HTML source."
   "If non-nil, default to showing HTML part rather than text part
 when both are available"
   :group 'rmail
-  :version "24.5"
+  :version "25.1"
   :type 'boolean)
 
 ;;; End of user options.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 6e34856a016..3329c3263c9 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -59,7 +59,7 @@
 
 (defcustom eww-bookmarks-directory user-emacs-directory
   "Directory where bookmark files will be stored."
-  :version "24.5"
+  :version "25.1"
   :group 'eww
   :type 'string)
 
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 05a476696cd..804e28e5086 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -87,7 +87,7 @@
   "%d.%m.%y, %H:%M"
   "Format for the date column in the treeview list buffer.
 See `format-time-string' for a list of valid specifiers."
-  :version "24.5"
+  :version "25.1"
   :type 'string
   :group 'newsticker-treeview)
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f06f8bd292e..f36487971c4 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -661,7 +661,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
 (defcustom rcirc-reconnect-delay 0
   "The minimum interval in seconds between reconnect attempts.
 When 0, do not auto-reconnect."
-  :version "24.5"
+  :version "25.1"
   :type 'integer
   :group 'rcirc)
 
diff --git a/lisp/printing.el b/lisp/printing.el
index 39da132d64e..101c8e2a8e7 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -3172,7 +3172,7 @@ See `pr-ps-printer-alist'.")
 
 (defmacro pr-save-file-modes (&rest body)
   "Execute BODY with file permissions temporarily set to `pr-file-modes'."
-  (declare (obsolete with-file-modes "24.5"))
+  (declare (obsolete with-file-modes "25.1"))
   `(with-file-modes pr-file-modes ,@body))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 839f5290ae3..cda421fbc86 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -139,7 +139,7 @@
 (defcustom hide-ifdef-exclude-define-regexp nil
   "Ignore #define names if those names match this exclusion pattern."
   :type 'string
-  :version "24.5")
+  :version "25.1")
 
 (defcustom hide-ifdef-expand-reinclusion-protection t
   "Non-nil means don't hide an entire header file enclosed by #ifndef...#endif.
@@ -161,7 +161,7 @@ be hidden.
 This behavior is generally undesirable.  If this option is non-nil, the outermost
 #if is always visible."
   :type 'boolean
-  :version "24.5")
+  :version "25.1")
 
 (defcustom hide-ifdef-header-regexp
   "\\.h\\(h\\|xx\\|pp\\)?\\'"
@@ -169,7 +169,7 @@ This behavior is generally undesirable.  If this option is non-nil, the outermos
 Effective only if `hide-ifdef-expand-reinclusion-protection' is t."
   :type 'string
   :group 'hide-ifdef
-  :version "24.5")
+  :version "25.1")
 
 (defvar hide-ifdef-mode-submap
   ;; Set up the submap that goes after the prefix key.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5999ddda5f9..e617e2932d0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1801,7 +1801,7 @@ It should not contain a caret (^) at the beginning."
   :type 'string)
 
 (define-obsolete-variable-alias
-  'python-shell-enable-font-lock 'python-shell-font-lock-enable "24.5")
+  'python-shell-enable-font-lock 'python-shell-font-lock-enable "25.1")
 
 (defcustom python-shell-font-lock-enable t
   "Should syntax highlighting be enabled in the Python shell buffer?
@@ -2179,7 +2179,7 @@ banner and the initial prompt are received separately."
 (define-obsolete-function-alias
   'python-comint-output-filter-function
   'ansi-color-filter-apply
-  "24.5")
+  "25.1")
 
 (defun python-comint-postoutput-scroll-to-bottom (output)
   "Faster version of `comint-postoutput-scroll-to-bottom'.
@@ -2881,7 +2881,7 @@ the full statement in the case of imports."
 (define-obsolete-variable-alias
   'python-shell-completion-pdb-string-code
   'python-shell-completion-string-code
-  "24.5"
+  "25.1"
   "Completion string code must work for (i)pdb.")
 
 (defun python-shell-completion-get-completions (process import input)
@@ -2952,7 +2952,7 @@ using that one instead of current buffer's process."
 (define-obsolete-function-alias
   'python-shell-completion-complete-at-point
   'python-shell-completion-at-point
-  "24.5")
+  "25.1")
 
 (defun python-shell-completion-complete-or-indent ()
   "Complete or indent depending on the context.
@@ -3072,7 +3072,7 @@ inferior Python process is updated properly."
 (define-obsolete-function-alias
   'python-completion-complete-at-point
   'python-completion-at-point
-  "24.5")
+  "25.1")
 
 
 ;;; Fill paragraph
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 304ff465955..af7cb0dc2f5 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -284,7 +284,7 @@ file.  Since that is a plaintext file, this could be dangerous."
 
 (defcustom sql-default-directory nil
   "Default directory for SQL processes."
-  :version "24.5"
+  :version "25.1"
   :type '(choice (const nil) string)
   :group 'SQL
   :safe 'stringp)
@@ -5074,20 +5074,20 @@ buffer.
 
 (defcustom sql-vertica-program "vsql"
   "Command to start the Vertica client."
-  :version "24.5"
+  :version "25.1"
   :type 'file
   :group 'SQL)
 
 (defcustom sql-vertica-options '("-P" "pager=off")
   "List of additional options for `sql-vertica-program'.
 The default value disables the internal pager."
-  :version "24.5"
+  :version "25.1"
   :type '(repeat string)
   :group 'SQL)
 
 (defcustom sql-vertica-login-params '(user password database server)
   "List of login parameters needed to connect to Vertica."
-  :version "24.5"
+  :version "25.1"
   :type 'sql-login-params
   :group 'SQL)
 
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 892b2aa1b06..e49037e41e7 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -88,7 +88,7 @@
 
 ;;;###autoload
 (define-obsolete-function-alias
-  'capitalized-words-mode 'subword-mode "24.5")
+  'capitalized-words-mode 'subword-mode "25.1")
 
 ;;;###autoload
 (define-minor-mode subword-mode
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 7cb8f457e3f..6a88c6ff0ab 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -684,7 +684,7 @@ Adapted from `font-lock-match-c-style-declaration-item-and-skip-to-next'."
   :group 'font-lock-highlighting-faces)
 
 (define-obsolete-function-alias 'vera-fontify-buffer
-  'font-lock-fontify-buffer "24.5")
+  'font-lock-fontify-buffer "25.1")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Indentation
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index b649959bae3..e9faa81fd82 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1027,7 +1027,7 @@ If 'packed', then as many inputs and outputs that fit within
 
 If 'single', then a single input or output will be put onto each
 line."
-  :version "24.5"
+  :version "25.1"
   :type '(radio (const :tag "Line up Assignments and Declarations" packed)
 		(const :tag "Line up Assignment statements" single))
   :group 'verilog-mode-auto)
diff --git a/lisp/rect.el b/lisp/rect.el
index 23bbbfbbdcd..90c8f94f0ab 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -35,7 +35,7 @@
 
 (defgroup rectangle nil
   "Operations on rectangles."
-  :version "24.5"
+  :version "25.1"
   :group 'editing)
 
 ;; FIXME: this function should be replaced by `apply-on-rectangle'
diff --git a/lisp/simple.el b/lisp/simple.el
index 24f8ae9ac76..8469ff0d892 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2515,6 +2515,7 @@ marker adjustment's corresponding (TEXT . POS) element."
   "Test whether UNDO-ELT crosses one edge of that region START ... END.
 This assumes we have already decided that UNDO-ELT
 is not *inside* the region START...END."
+  (declare (obsolete nil "25.1"))
   (cond ((atom undo-elt) nil)
 	((null (car undo-elt))
 	 ;; (nil PROPERTY VALUE BEG . END)
@@ -2525,7 +2526,6 @@ is not *inside* the region START...END."
 	 ;; (BEGIN . END)
 	 (and (< (car undo-elt) end)
 	      (> (cdr undo-elt) start)))))
-(make-obsolete 'undo-elt-crosses-region nil "24.5")
 
 (defun undo-adjust-elt (elt deltas)
   "Return adjustment of undo element ELT by the undo DELTAS
@@ -3758,7 +3758,7 @@ argument should still be a \"useful\" string for such uses."
   "Whether appending to kill ring also makes \\[undo] restore both pieces of text simultaneously."
   :type 'boolean
   :group 'killing
-  :version "24.5")
+  :version "25.1")
 
 (defun kill-append (string before-p)
   "Append STRING to the end of the latest kill in the kill ring.
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 8c7ac312b9f..bc10eab0498 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2579,7 +2579,7 @@ If you use pdflatex instead of latex, set this to \".pdf\" and modify
  `tex-dvi-view-command' and `tex-dvi-print-command' appropriately."
   :type 'string
   :group 'tex-view
-  :version "24.5")
+  :version "25.1")
 
 (defun tex-print (&optional alt)
   "Print the .dvi file made by \\[tex-region], \\[tex-buffer] or \\[tex-file].
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 6b7ab8c9ce6..56a0986b41c 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -122,7 +122,7 @@ regular expression avoids conflicts with local files that look
 like URLs \(Gnus is particularly bad at this\)."
   :group 'url
   :type 'regexp
-  :version "24.5"
+  :version "25.1"
   :set (lambda (symbol value)
 	 (let ((enable url-handler-mode))
 	   (url-handler-mode 0)
diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 83cedd1d62c..9cc17a35346 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -33,7 +33,7 @@
   "List of URL protocols the work is handled by Tramp.
 They must also be covered by `url-handler-regexp'."
   :group 'url
-  :version "24.5"
+  :version "25.1"
   :type '(list string))
 
 (defun url-tramp-convert-url-to-tramp (url)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index d4e973956c8..9afb9f47e91 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -304,7 +304,7 @@ well."
 (defface diff-changed
   '((t nil))
   "`diff-mode' face used to highlight changed lines."
-  :version "24.5"
+  :version "25.1"
   :group 'diff-mode)
 (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1")
 (defvar diff-changed-face 'diff-changed)
@@ -343,7 +343,7 @@ well."
     (((class color grayscale) (min-colors 88) (background dark))
      :foreground "#dddddd"))
   "`diff-mode' face used to highlight context and other side-information."
-  :version "24.5"
+  :version "25.1"
   :group 'diff-mode)
 (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1")
 (defvar diff-context-face 'diff-context)
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index d0887fe3531..580e7727a06 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -60,7 +60,7 @@ is applied to the background."
 	   (with-demoted-errors
 	     ;; Update the value of the dependent variable.
 	     (custom-reevaluate-setting 'vc-annotate-color-map))))
-  :version "24.5"
+  :version "25.1"
   :group 'vc)
 
 (defcustom vc-annotate-color-map
diff --git a/src/ChangeLog b/src/ChangeLog
index 89fc763fc53..698eab54b8f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4435,8 +4435,7 @@
 	* doc.c (store_function_docstring): Warn when we don't know where to
 	put a docstring.
 	(Fsubstitute_command_keys): Don't advertise the fact that
-	text-properties are dropped, since we think it's a bug that we'll fix
-	in 24.5.
+	text-properties are dropped, since we think it's a bug that we'll fix.
 
 	* frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date.
 	* xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame.