* lisp/vc/vc-hooks.el (vc-prefix-map): Move 'B' to 'o' (bug#80037).

3 files changed, 12 insertions, 12 deletions

diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 49187afc971..45635b358d3 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -298,11 +298,11 @@ yet merged into the target branch.
 @cindex outstanding changes
 
 @table @kbd
-@item C-x v B =
+@item C-x v o =
 Display diffs of changes to the VC fileset since the merge base of this
 branch and its upstream counterpart (@code{vc-diff-outgoing-base}).
 
-@item C-x v B D
+@item C-x v o D
 Display all changes since the merge base of this branch and its upstream
 counterpart (@code{vc-root-diff-outgoing-base}).
 @end table
@@ -321,17 +321,17 @@ unpushed commits and uncommitted changes in your working tree.  In many
 cases the reason these changes are not pushed yet is that they are not
 finished: the changes committed so far don't make sense in isolation.
 
-@kindex C-x v B =
+@kindex C-x v o =
 @findex vc-diff-outgoing-base
-@kindex C-x v B D
+@kindex C-x v o D
 @findex vc-root-diff-outgoing-base
-Type @kbd{C-x v B D} (@code{vc-root-diff-outgoing-base}) to display a
+Type @kbd{C-x v o D} (@code{vc-root-diff-outgoing-base}) to display a
 summary of all these changes, committed and uncommitted.  This summary
 is in the form of a diff of what committing and pushing (@pxref{Pulling
 / Pushing}) all these changes would do to the upstream repository.  You
-can use @kbd{C-x v B =} (@code{vc-diff-outgoing-base}) instead to limit
+can use @kbd{C-x v o =} (@code{vc-diff-outgoing-base}) instead to limit
 the display of changes to the current VC fileset.  (The difference
-between @w{@kbd{C-x v B D}} and @w{@kbd{C-x v B =}} is like the
+between @w{@kbd{C-x v o D}} and @w{@kbd{C-x v o =}} is like the
 difference between @kbd{C-x v D} and @kbd{C-x v =} (@pxref{Old
 Revisions}).)@footnote{Another point of comparison is that these
 commands are like @w{@kbd{C-x v O =}} (@code{vc-fileset-diff-outgoing})
@@ -369,8 +369,8 @@ the upstream version of the trunk, to which you and your collaborators
 push finished work.
 
 To display a summary of outgoing changes in this multi-branch example,
-supply a prefix argument, by typing @w{@kbd{C-u C-x v B =}} or
-@w{@kbd{C-u C-x v B D}}.  When prompted, enter the outgoing base.
+supply a prefix argument, by typing @w{@kbd{C-u C-x v o =}} or
+@w{@kbd{C-u C-x v o D}}.  When prompted, enter the outgoing base.
 Exactly what you must supply here depends on the name of your
 development trunk and the version control system in use.  For example,
 with Git, usually you will enter @kbd{origin/master}.  We hope to
diff --git a/etc/NEWS b/etc/NEWS
index 0743d56a20b..8dd3bdbca2e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2621,7 +2621,7 @@ current VC fileset.
 
 +++
 *** New commands to report diffs of outstanding changes.
-'C-x v B =' ('vc-diff-outgoing-base') and 'C-x v B D'
+'C-x v o =' ('vc-diff-outgoing-base') and 'C-x v o D'
 ('vc-root-diff-outgoing-base') report diffs of changes since the merge
 base with the remote branch, including uncommitted changes.
 They are useful to view all outstanding (unmerged, unpushed) changes on
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 7ae4c67f90a..b8502b31a96 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1018,8 +1018,8 @@ In the latter case, VC mode is deactivated for this buffer."
   "O"   #'vc-log-outgoing
   "M L" #'vc-log-mergebase
   "M D" #'vc-diff-mergebase
-  "B =" #'vc-diff-outgoing-base
-  "B D" #'vc-root-diff-outgoing-base
+  "o =" #'vc-diff-outgoing-base
+  "o D" #'vc-root-diff-outgoing-base
   "m"   #'vc-merge
   "r"   #'vc-retrieve-tag
   "s"   #'vc-create-tag