From: Philip Kaludercic <philipk@posteo.net>
Date: Sat, 8 Oct 2022 09:56:23 +0000 (+0200)
Subject: Merge branch 'master' into feature/package+vc
X-Git-Tag: emacs-29.0.90~1616^2~307^2~77
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cfeb8a9e0f69e3cd11aebe03da876e1c713a85f;p=emacs.git

Merge branch 'master' into feature/package+vc
---

8cfeb8a9e0f69e3cd11aebe03da876e1c713a85f
diff --cc lisp/vc/vc.el
index fe0cb42e31b,72189cfcb87..14b149310c4
--- a/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.
  ;;
+ ;; - 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.
- ;;
- ;; - send-patch (addr &optional rev-list)
- ;;
- ;;   Send a patch to ADDR
- 
  
  ;;; Changes from the pre-25.1 API:
  ;;