Merge branch 'master' into feature/package+vc

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/vc/vc-bzr.el
Simple merge

diff --cc lisp/vc/vc-cvs.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge

diff --cc lisp/vc/vc-hg.el
Simple merge

diff --cc lisp/vc/vc-svn.el
Simple merge

diff --cc lisp/vc/vc.el
index fe0cb42e31b72515f86756cb1feda13cd1b38741,72189cfcb87cbc65e60d0cb11bb5fd241bc03149..14b149310c4ed279c493beccdffd772f94dc734e
--- 1/lisp/vc/vc.el
--- 2/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@@ -569,15 -575,15 +575,20 @@@
  ;;   remote (in Git parlance) whose URL is to be returned.  It has
  ;;   only a meaning for distributed VCS and is ignored otherwise.
  ;;
- ;;
- ;; - send-patch (addr &optional rev-list)
- ;;
- ;;   Send a patch to ADDR
- 
+ ;; - prepare-patch (rev)
+ ;;
+ ;;   Prepare a patch and return a property list with the keys
+ ;;   `:subject' indicating the patch message as a string, `:buffer'
+ ;;   with a buffer object that contains the entire patch message and
+ ;;   `:body-start' and `:body-end' demarcating what part of said
+ ;;   buffer should be inserted into an inline patch.  If the two last
+ ;;   properties are omitted, `point-min' and `point-max' will
+ ;;   respectively be used instead.
++;;
 +;; - clone (remote directory)
 +;;
 +;;   Attempt to clone a REMOTE repository, into a local DIRECTORY.
 +;;   Returns the symbol of the backend used if successful.
  
  ;;; Changes from the pre-25.1 API:
  ;;