-

34 files changed, 105 insertions, 80 deletions

diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 30320b00946..ce367485c16 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -670,7 +670,7 @@ SYMBOL is a function that can be overridden."
 
 (add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)
 
-(declare-function xref-item-location "xref" (xref))
+(declare-function xref-item-location "xref" (xref) t)
 
 (defun xref-mode-local--override-present (sym xrefs)
   "Return non-nil if SYM is in XREFS."
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index dcc697e1b9a..a352ed0849c 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -322,7 +322,7 @@ This function is semi-obsolete.  Use `get-char-code-property'."
                                                (nth 13 fields) 16)))))))))))
 
 ;; Not defined on builds without X, but behind display-graphic-p.
-(declare-function internal-char-font "fontset.c" (position &optional ch))
+(declare-function internal-char-font "font.c" (position &optional ch))
 
 ;; Return information about how CHAR is displayed at the buffer
 ;; position POS.  If the selected frame is on a graphic display,
diff --git a/lisp/electric.el b/lisp/electric.el
index abddd986ef8..ab79943c9dd 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -417,14 +417,17 @@ The variable `electric-layout-rules' says when and how to insert newlines."
 
 (defcustom electric-quote-comment t
   "Non-nil means to use electric quoting in program comments."
+  :version "25.1"
   :type 'boolean :safe 'booleanp :group 'electricity)
 
 (defcustom electric-quote-string nil
   "Non-nil means to use electric quoting in program strings."
+  :version "25.1"
   :type 'boolean :safe 'booleanp :group 'electricity)
 
 (defcustom electric-quote-paragraph t
   "Non-nil means to use electric quoting in text paragraphs."
+  :version "25.1"
   :type 'boolean :safe 'booleanp :group 'electricity)
 
 (defun electric--insertable-p (string)
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 513aa319798..b6fa0546088 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -131,6 +131,7 @@ With optional argument FULL, sums the number of elements in each element."
 
 (defcustom check-declare-ext-errors nil
   "When non-nil, warn about functions not found in :ext."
+  :version "25.1"
   :type 'boolean)
 
 (defun check-declare-verify (fnfile fnlist)
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el
index 70c4458d300..ac063d4896a 100644
--- a/lisp/emacs-lisp/cursor-sensor.el
+++ b/lisp/emacs-lisp/cursor-sensor.el
@@ -167,8 +167,8 @@
 This property should hold a list of functions which react to the motion
 of the cursor.  They're called with three arguments (WINDOW OLDPOS DIR)
 where WINDOW is the affected window, OLDPOS is the last known position of
-the cursor and DIR can be `left' or `entered' depending on whether the cursor is
-entering the area covered by the text-property property or leaving it."
+the cursor and DIR can be `entered' or `left' depending on whether the cursor
+is entering the area covered by the text-property property or leaving it."
   nil nil nil
   (if cursor-sensor-mode
       (add-hook 'pre-redisplay-functions #'cursor-sensor--detect
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 057d01488cc..08f64147d44 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -329,6 +329,7 @@ by running `package-install-selected-packages'.
 To check if a package is contained in this list here, use
 `package--user-selected-p', as it may populate the variable with
 a sane initial value."
+  :version "25.1"
   :type '(repeat symbol))
 
 (defcustom package-menu-async t
@@ -2654,6 +2655,7 @@ omitted from the package menu.  To toggle this, type \\[package-menu-toggle-hidi
 
 Values can be interactively added to this list by typing
 \\[package-menu-hide-package] on a package"
+  :version "25.1"
   :type '(repeat (regexp :tag "Hide packages with name matching")))
 
 (defun package-menu--refresh (&optional packages keywords)
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 5fac079d3c0..e92bcd62a66 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -53,6 +53,7 @@
 
 (defcustom epg-gpgconf-program "gpgconf"
   "The `gpgconf' executable."
+  :version "25.1"
   :group 'epg
   :type 'string)
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 3824c195d39..56317b83a98 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -265,14 +265,16 @@ A typical value would be \(\"JOIN\" \"PART\" \"QUIT\")."
 (defcustom erc-network-hide-list nil
   "A list of IRC networks to hide message types from.
 A typical value would be \((\"freenode\" \"MODE\")
-(\"OFTC\" \"JOIN\" \"QUIT\"))."
+  \(\"OFTC\" \"JOIN\" \"QUIT\"))."
+  :version "25.1"
   :group 'erc-ignore
   :type 'erc-message-type)
 
 (defcustom erc-channel-hide-list nil
   "A list of IRC channels to hide message types from.
 A typical value would be \((\"#emacs\" \"QUIT\" \"JOIN\")
-(\"#erc\" \"NICK\")."
+  \(\"#erc\" \"NICK\")."
+  :version "25.1"
   :group 'erc-ignore
   :type 'erc-message-type)
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index aabc5fdb1a2..3e5de0c0097 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -136,6 +136,7 @@ character to the invoked process."
   "If non-nil, term buffers are destroyed after their processes die.
 WARNING: Setting this to non-nil may result in unexpected
 behavior for short-lived processes, see bug#18108."
+  :version "25.1"
   :type 'boolean
   :group 'eshell-term)
 
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index fa78b5c6e15..a6b27300233 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -44,7 +44,7 @@
   "Regexp to match faces in `gnus-x-face-directory' to be omitted."
   :version "25.1"
   :group 'gnus-fun
-  :type 'string)
+  :type '(choice (const nil) string))
 
 (defcustom gnus-face-directory (expand-file-name "faces" gnus-directory)
   "*Directory where Face PNG files are stored."
@@ -56,7 +56,7 @@
   "Regexp to match faces in `gnus-face-directory' to be omitted."
   :version "25.1"
   :group 'gnus-fun
-  :type 'string)
+  :type '(choice (const nil) string))
 
 (defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
   "Command for converting a PBM to an X-Face."
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 1196ea9dfec..5d2ce7ee19f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1637,6 +1637,7 @@ this variable.  I think."
                                              (const post-mail))
                         (checklist :inline t :greedy t
                                    (const :format "%v " address)
+                                   (const cloud)
                                    (const global)
                                    (const :format "%v " prompt-address)
                                    (const :format "%v " physical-address)
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 0a5f472079d..48e6384497e 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -432,15 +432,18 @@ If called with a prefix argument, only encrypt (do NOT sign)."
 
 ;;; Common functionality for mml1991.el, mml2015.el, mml-smime.el
 
-(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers)
-(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers)
+(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers
+  "25.1")
+(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers
+  "25.1")
 (defcustom mml-secure-openpgp-signers nil
   "A list of your own key ID(s) which will be used to sign OpenPGP messages.
 If set, it is added to the setting of `mml-secure-openpgp-sign-with-sender'."
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
-(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers)
+(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers
+  "25.1")
 (defcustom mml-secure-smime-signers nil
   "A list of your own key ID(s) which will be used to sign S/MIME messages.
 If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
@@ -448,9 +451,9 @@ If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
   :type '(repeat (string :tag "Key ID")))
 
 (define-obsolete-variable-alias
-  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
+  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
 (define-obsolete-variable-alias
-  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
+  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
 (defcustom mml-secure-openpgp-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with OpenPGP.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -469,7 +472,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
                  (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self)
+  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self "25.1")
 (defcustom mml-secure-smime-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with S/MIME.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -488,7 +491,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
                  (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender)
+  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender "25.1")
 ;mml1991-sign-with-sender did never exist.
 (defcustom mml-secure-openpgp-sign-with-sender nil
   "If t, use message sender to find an OpenPGP key to sign with."
@@ -496,14 +499,14 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender)
+  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender "25.1")
 (defcustom mml-secure-smime-sign-with-sender nil
   "If t, use message sender to find an S/MIME key to sign with."
   :group 'mime-security
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml2015-always-trust 'mml-secure-openpgp-always-trust)
+  'mml2015-always-trust 'mml-secure-openpgp-always-trust "25.1")
 ;mml1991-always-trust did never exist.
 (defcustom mml-secure-openpgp-always-trust t
   "If t, skip key validation of GnuPG on encryption."
@@ -513,6 +516,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
 (defcustom mml-secure-fail-when-key-problem nil
   "If t, raise an error if some key is missing or several keys exist.
 Otherwise, ask the user."
+  :version "25.1"
   :group 'mime-security
   :type 'boolean)
 
@@ -523,6 +527,7 @@ This variable is only relevant if a recipient owns multiple key pairs (for
 encryption) or you own multiple key pairs (for signing).  In such cases,
 you will be asked which key(s) should be used, and your choice can be
 customized in this variable."
+  :version "25.1"
   :group 'mime-security
   :type '(alist :key-type (symbol :tag "Protocol") :value-type
                 (alist :key-type (symbol :tag "Usage") :value-type
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index a40595ecbd5..2d8f25c5003 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -350,9 +350,9 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-expand-group "epg-config")
   (autoload 'epa-select-keys "epa"))
 
-(declare-function epg-key-sub-key-list   "ext:epg" (key))
-(declare-function epg-sub-key-capability "ext:epg" (sub-key))
-(declare-function epg-sub-key-validity   "ext:epg" (sub-key))
+(declare-function epg-key-sub-key-list   "epg" (key) t)
+(declare-function epg-sub-key-capability "epg" (sub-key) t)
+(declare-function epg-sub-key-validity   "epg" (sub-key) t)
 
 (autoload 'mml-compute-boundary "mml")
 
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 0e10dfdb8be..f56b04568c8 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1115,24 +1115,14 @@ command whose response triggered the error."
 
 (deffoo nntp-request-newgroups (date &optional server)
   (nntp-with-open-group
-   nil server
-   (with-current-buffer nntp-server-buffer
-     (let* ((time (date-to-time date))
-            (ls (- (cadr time) (nth 8 (decode-time time)))))
-       (cond ((< ls 0)
-              (setcar time (1- (car time)))
-              (setcar (cdr time) (+ ls 65536)))
-             ((>= ls 65536)
-              (setcar time (1+ (car time)))
-              (setcar (cdr time) (- ls 65536)))
-             (t
-              (setcar (cdr time) ls)))
-       (prog1
-           (nntp-send-command
-            "^\\.\r?\n" "NEWGROUPS"
-            (format-time-string "%y%m%d %H%M%S" time)
-            "GMT")
-         (nntp-decode-text))))))
+      nil server
+    (with-current-buffer nntp-server-buffer
+      (prog1
+          (nntp-send-command
+           "^\\.\r?\n" "NEWGROUPS"
+           (format-time-string "%y%m%d %H%M%S" (date-to-time date) t)
+           "GMT")
+        (nntp-decode-text)))))
 
 (deffoo nntp-request-post (&optional server)
   (nntp-with-open-group
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 24ad342d4e0..ae58f1ec7e1 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -259,7 +259,7 @@ language environment LANG-ENV."
         (with-coding-priority coding-priority
           (detect-coding-region from to)))))
 
-(declare-function internal-char-font "fontset.c" (position &optional ch))
+(declare-function internal-char-font "font.c" (position &optional ch))
 
 ;;;###autoload
 (defun char-displayable-p (char)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 05511a84540..5464c38af76 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -694,8 +694,9 @@ Element N specifies the summary line for message N+1.")
 This is set to nil by default.")
 
 (defcustom rmail-get-coding-function nil
-  "Function of no args to try to determine coding system for a message."
-  :type 'function
+  "Function of no args to try to determine coding system for a message.
+If nil, just search for `rmail-mime-charset-pattern'."
+  :type '(choice (const nil) function)
   :group 'rmail
   :version "24.4")
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 26fa0d94b88..2bda97f95d0 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -349,6 +349,7 @@ functionality is not available there."
   "Whether to open up new windows in a buffer or a new window.
 If non-nil, then open the URL in a new buffer rather than a new window if
 `browse-url-conkeror' is asked to open it in a new window."
+  :version "25.1"
   :type 'boolean
   :group 'browse-url)
 
@@ -415,6 +416,7 @@ commands reverses the effect of this variable."
 
 (defcustom browse-url-conkeror-arguments nil
   "A list of strings to pass to Conkeror as arguments."
+  :version "25.1"
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
 
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 1647ef85364..9c29216ccaf 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -69,6 +69,7 @@ This must be one of the functions `newsticker-plainview' or
 (defcustom newsticker-download-logos
   t
   "If non-nil newsticker downloads logo images of subscribed feeds."
+  :version "25.1"
   :type 'boolean
   :group 'newsticker-reader)
 
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 0e75236154b..4de3d1d1125 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -132,9 +132,9 @@ Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\")
 
 (defcustom newsticker-groups-filename
   nil
-  "Name of the newsticker groups settings file.  This variable is obsolete."
+  "Name of the newsticker groups settings file."
   :version "25.1"                       ; changed default value to nil
-  :type 'string
+  :type '(choice (const nil) string)
   :group 'newsticker-treeview)
 (make-obsolete-variable 'newsticker-groups-filename 'newsticker-dir "23.1")
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 2db7220de5c..271033b15f8 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1794,7 +1794,6 @@ Two variables control the processing we do on each file: the value of
 interesting (it returns non-nil if so) and `tags-loop-operate' is a form to
 evaluate to operate on an interesting file.  If the latter evaluates to
 nil, we exit; otherwise we scan the next file."
-  (declare (obsolete "use `xref-find-definitions' interface instead." "25.1"))
   (interactive)
   (let (new
         ;; Non-nil means we have finished one file
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index c22de2f77ac..1a0385e167e 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1742,6 +1742,7 @@ and source-file directory for your debugger."
 (defcustom gud-guiler-command-name "guile"
   "File name for executing the Guile debugger.
 This should be an executable on your path, or an absolute file name."
+  :version "25.1"
   :type 'string
   :group 'gud)
 
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 43cf42c048b..cc7d1c368c5 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -138,7 +138,7 @@
 
 (defcustom hide-ifdef-exclude-define-regexp nil
   "Ignore #define names if those names match this exclusion pattern."
-  :type 'string
+  :type '(choice (const nil) string)
   :version "25.1")
 
 (defcustom hide-ifdef-expand-reinclusion-protection t
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 2f12df47723..718b33932ed 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -202,6 +202,7 @@ is immediately after the symbol.  The prettification will be
 reapplied as soon as point moves away from the symbol.  If
 set to nil, the prettification persists even when point is
 on the symbol."
+  :version "25.1"
   :type '(choice (const :tag "Never unprettify" nil)
                  (const :tag "Unprettify when point is inside" t)
                  (const :tag "Unprettify when point is inside or at right edge" right-edge))
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index fe28ed776b2..a972def24b0 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -156,10 +156,11 @@ end it with `/'.  DIR must be one of `project-roots' or
 
 (defgroup project-vc nil
   "Project implementation using the VC package."
+  :version "25.1"
   :group 'tools)
 
 (defcustom project-vc-ignores nil
-  "List ot patterns to include in `project-ignores'."
+  "List of patterns to include in `project-ignores'."
   :type '(repeat string)
   :safe 'listp)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3bcbf07cbbd..a8c65fa23a9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -715,6 +715,7 @@ It makes underscores and dots word constituent chars.")
 
 (defcustom python-indent-guess-indent-offset-verbose t
   "Non-nil means to emit a warning when indentation guessing fails."
+  :version "25.1"
   :type 'boolean
   :group 'python
   :safe' booleanp)
@@ -1999,6 +2000,7 @@ hosts PATH before starting processes.  Values defined in
 here.  Normally you wont use this variable directly unless you
 plan to ensure a particular set of paths to all Python shell
 executed through tramp connections."
+  :version "25.1"
   :type '(repeat string)
   :group 'python)
 
@@ -2621,6 +2623,7 @@ current process to not hang waiting for output by safeguarding
 interactive actions can be performed.  This is useful to safely
 attach setup code for long-running processes that eventually
 provide a shell."
+  :version "25.1"
   :type 'hook
   :group 'python)
 
@@ -3258,18 +3261,22 @@ the full statement in the case of imports."
   (list "pypy")
   "List of disabled interpreters.
 When a match is found, native completion is disabled."
+  :version "25.1"
   :type '(repeat string))
 
 (defcustom python-shell-completion-native-enable t
   "Enable readline based native completion."
+  :version "25.1"
   :type 'boolean)
 
 (defcustom python-shell-completion-native-output-timeout 5.0
   "Time in seconds to wait for completion output before giving up."
+  :version "25.1"
   :type 'float)
 
 (defcustom python-shell-completion-native-try-output-timeout 1.0
   "Time in seconds to wait for *trying* native completion output."
+  :version "25.1"
   :type 'float)
 
 (defvar python-shell-completion-native-redirect-buffer
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index fe39122d24f..6220b4cdc92 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -76,6 +76,7 @@
   (require 'semantic/symref)) ;; for hit-lines slot
 
 (defgroup xref nil "Cross-referencing commands"
+  :version "25.1"
   :group 'tools)
 
 
diff --git a/lisp/rect.el b/lisp/rect.el
index 789d0e9082d..73790f2f92a 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -403,6 +403,7 @@ With a prefix (or a FILL) argument, also fill too short lines."
 
 (defcustom rectangle-preview t
   "If non-nil, `string-rectangle' will show an-the-fly preview."
+  :version "25.1"
   :type 'boolean)
 
 (defun rectangle--string-preview ()
diff --git a/lisp/term/screen.el b/lisp/term/screen.el
index 704fbefb0ad..7f681154d6e 100644
--- a/lisp/term/screen.el
+++ b/lisp/term/screen.el
@@ -7,6 +7,7 @@
   "Extra capabilities supported under \"screen\".
 Some features of screen depend on the terminal emulator in which
 it runs, which can change when the screen session is moved to another tty."
+  :version "25.1"
   :type xterm--extra-capabilities-type
   :group 'xterm)
 
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 104f98311a8..e06423ccfdd 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -65,6 +65,7 @@ using the OSC 52 sequence.
 If you select a region larger than this size, it won't be copied to your system
 clipboard.  Since clipboard data is base 64 encoded, the actual number of
 string bytes that can be copied is 3/4 of this value."
+  :version "25.1"
   :type 'integer)
 
 (defconst xterm-paste-ending-sequence "\e[201~"
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 48c24844a68..d402fb19955 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -257,13 +257,13 @@
        (if (not sassy)
            ;; We don't allow / as first char, so as not to
            ;; take a comment as the beginning of a selector.
-           "[^@/:{} \t\n][^:{}]+"
+           "[^@/:{}() \t\n][^:{}()]+"
          ;; Same as for non-sassy except we do want to allow { and }
          ;; chars in selectors in the case of #{$foo}
          ;; variable interpolation!
          (concat "\\(?:" scss--hash-re
-                 "\\|[^@/:{} \t\n#]\\)"
-                 "[^:{}#]*\\(?:" scss--hash-re "[^:{}#]*\\)*"))
+                 "\\|[^@/:{}() \t\n#]\\)"
+                 "[^:{}()#]*\\(?:" scss--hash-re "[^:{}()#]*\\)*"))
        ;; Even though pseudo-elements should be prefixed by ::, a
        ;; single colon is accepted for backward compatibility.
        "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids
@@ -271,8 +271,8 @@
        "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)"
        "\\(?:([^)]+)\\)?"
        (if (not sassy)
-           "[^:{}\n]*"
-         (concat "[^:{}\n#]*\\(?:" scss--hash-re "[^:{}\n#]*\\)*"))
+           "[^:{}()\n]*"
+         (concat "[^:{}()\n#]*\\(?:" scss--hash-re "[^:{}()\n#]*\\)*"))
        "\\)*"
        "\\)\\(?:\n[ \t]*\\)*{")
      (1 'css-selector keep))
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index eb799c09510..598060e9ec8 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -417,7 +417,7 @@ current `case-fold-search' setting."
   "A list of predicate functions for `tildify-space' function."
   :version "25.1"
   :group 'tildify
-  :type '(repeat 'function))
+  :type '(repeat function))
 
 (defcustom tildify-double-space-undos t
   "Weather `tildify-space' should undo hard space when space is typed again."
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 9794d002149..1686c02ada3 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -280,8 +280,8 @@ If nil, construct the regexp from `thing-at-point-uri-schemes'.")
     "finger://" "fish://" "ftp://" "geo:" "git://" "go:" "gopher://"
     "h323:" "http://" "https://" "im:" "imap://" "info:" "ipp:"
     "irc://" "irc6://" "ircs://" "iris.beep:" "jar:" "ldap://"
-    "ldaps://" "mailto:" "mid:"  "mtqp://" "mupdate://" "news:"
-    "nfs://" "nntp://" "opaquelocktoken:" "pop://" "pres:"
+    "ldaps://" "magnet:" "mailto:" "mid:"  "mtqp://" "mupdate://"
+    "news:" "nfs://" "nntp://" "opaquelocktoken:" "pop://" "pres:"
     "resource://" "rmi://" "rsync://" "rtsp://" "rtspu://" "service:"
     "sftp://" "sip:" "sips:" "smb://" "sms:" "snmp://" "soap.beep://"
     "soap.beeps://" "ssh://" "svn://" "svn+ssh://" "tag:" "tel:"
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 46c993e1f5f..d58942c3a2b 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -5,7 +5,6 @@
 
 ;; This file is part of GNU Emacs.
 
-;; Maintainer's Time-stamp: <2006-04-12 20:30:56 rms>
 ;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org>
 ;; Keywords: tools
 
@@ -27,7 +26,6 @@
 ;; A template in a file can be updated with a new time stamp when
 ;; you save the file.  For example:
 ;;     static char *ts = "sdmain.c Time-stamp: <2001-08-13 10:20:51 gildea>";
-;; See the top of `time-stamp.el' for another example.
 
 ;; To use time-stamping, add this line to your init file:
 ;;     (add-hook 'before-save-hook 'time-stamp)
@@ -121,9 +119,12 @@ If nil, no notification is given."
   :group 'time-stamp)
 
 (defcustom time-stamp-time-zone nil
-  "If non-nil, a string naming the timezone to be used by \\[time-stamp].
-Format is the same as that used by the environment variable TZ on your system."
-  :type '(choice (const nil) string)
+  "The time zone to be used by \\[time-stamp].
+Its format is that of the ZONE argument of the `format-time-string' function,"
+  :type '(choice (const :tag "Emacs local time" nil)
+                 (const :tag "Universal Time" t)
+                 (const :tag "system wall clock time" wall)
+                 (string :tag "TZ environment variable value"))
   :group 'time-stamp
   :version "20.1")
 ;;;###autoload(put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
@@ -412,6 +413,8 @@ With ARG, turn time stamping on if and only if arg is positive."
           (> (prefix-numeric-value arg) 0)))
   (message "time-stamp is now %s." (if time-stamp-active "active" "off")))
 
+(defun time-stamp--format (format time)
+  (format-time-string format time time-stamp-time-zone))
 
 (defun time-stamp-string (&optional ts-format)
   "Generate the new string to be inserted by \\[time-stamp].
@@ -420,8 +423,7 @@ format the string."
   (or ts-format
       (setq ts-format time-stamp-format))
   (if (stringp ts-format)
-      (format-time-string (time-stamp-string-preprocess ts-format)
-                          nil time-stamp-time-zone)
+      (time-stamp--format (time-stamp-string-preprocess ts-format) nil)
     ;; handle version 1 compatibility
     (cond ((or (eq time-stamp-old-format-warn 'error)
                (and (eq time-stamp-old-format-warn 'ask)
@@ -515,32 +517,32 @@ and all `time-stamp-format' compatibility."
           "%%")
          ((eq cur-char ?a)              ;day of week
           (if change-case
-              (format-time-string "%#a" time)
+              (time-stamp--format "%#a" time)
             (or alt-form (not (string-equal field-width ""))
                 (time-stamp-conv-warn "%a" "%:a"))
             (if (and alt-form (not (string-equal field-width "")))
                 ""                      ;discourage "%:3a"
-              (format-time-string "%A" time))))
+              (time-stamp--format "%A" time))))
          ((eq cur-char ?A)
           (if alt-form
-              (format-time-string "%A" time)
+              (time-stamp--format "%A" time)
             (or change-case (not (string-equal field-width ""))
                 (time-stamp-conv-warn "%A" "%#A"))
-            (format-time-string "%#A" time)))
+            (time-stamp--format "%#A" time)))
          ((eq cur-char ?b)              ;month name
           (if change-case
-              (format-time-string "%#b" time)
+              (time-stamp--format "%#b" time)
             (or alt-form (not (string-equal field-width ""))
                 (time-stamp-conv-warn "%b" "%:b"))
             (if (and alt-form (not (string-equal field-width "")))
                 ""                      ;discourage "%:3b"
-            (format-time-string "%B" time))))
+            (time-stamp--format "%B" time))))
          ((eq cur-char ?B)
           (if alt-form
-              (format-time-string "%B" time)
+              (time-stamp--format "%B" time)
             (or change-case (not (string-equal field-width ""))
                 (time-stamp-conv-warn "%B" "%#B"))
-            (format-time-string "%#B" time)))
+            (time-stamp--format "%#B" time)))
          ((eq cur-char ?d)              ;day of month, 1-31
           (time-stamp-do-number cur-char alt-form field-width time))
          ((eq cur-char ?H)              ;hour, 0-23
@@ -554,27 +556,27 @@ and all `time-stamp-format' compatibility."
          ((eq cur-char ?p)              ;am or pm
           (or change-case
               (time-stamp-conv-warn "%p" "%#p"))
-          (format-time-string "%#p" time))
+          (time-stamp--format "%#p" time))
          ((eq cur-char ?P)              ;AM or PM
-          (format-time-string "%p" time))
+          (time-stamp--format "%p" time))
          ((eq cur-char ?S)              ;seconds, 00-60
           (time-stamp-do-number cur-char alt-form field-width time))
          ((eq cur-char ?w)              ;weekday number, Sunday is 0
-          (format-time-string "%w" time))
+          (time-stamp--format "%w" time))
          ((eq cur-char ?y)              ;year
           (or alt-form (not (string-equal field-width ""))
               (time-stamp-conv-warn "%y" "%:y"))
-          (string-to-number (format-time-string "%Y" time)))
+          (string-to-number (time-stamp--format "%Y" time)))
          ((eq cur-char ?Y)              ;4-digit year, new style
-          (string-to-number (format-time-string "%Y" time)))
+          (string-to-number (time-stamp--format "%Y" time)))
          ((eq cur-char ?z)              ;time zone lower case
           (if change-case
               ""                        ;discourage %z variations
-            (format-time-string "%#Z" time)))
+            (time-stamp--format "%#Z" time)))
          ((eq cur-char ?Z)
           (if change-case
-              (format-time-string "%#Z" time)
-            (format-time-string "%Z" time)))
+              (time-stamp--format "%#Z" time)
+            (time-stamp--format "%Z" time)))
          ((eq cur-char ?f)              ;buffer-file-name, base name only
           (if buffer-file-name
               (file-name-nondirectory buffer-file-name)
@@ -634,7 +636,7 @@ width specification or \"\".  TIME is the time to convert."
                                (format "%%:%c" format-char)))
     (if (and alt-form (not (string-equal field-width "")))
         ""                              ;discourage "%:2d" and the like
-      (string-to-number (format-time-string format-string time)))))
+      (string-to-number (time-stamp--format format-string time)))))
 
 (defvar time-stamp-conversion-warn t
   "Warn about soon-to-be-unsupported forms in `time-stamp-format'.
diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 9e191579d47..192a0459f33 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -30,11 +30,11 @@
 
 ;;;###autoload
 (defcustom url-tramp-protocols '("ftp" "ssh" "scp" "rsync" "telnet")
-  "List of URL protocols the work is handled by Tramp.
+  "List of URL protocols for which the work is handled by Tramp.
 They must also be covered by `url-handler-regexp'."
   :group 'url
   :version "25.1"
-  :type '(list string))
+  :type '(repeat string))
 
 (defun url-tramp-convert-url-to-tramp (url)
   "Convert URL to a Tramp file name."