branch: elpa/magit
commit b3e6ec094e2c6e5ac617be383f3d900ff9bfdc0b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
manual: Move magit-diff-visit-previous-blob to end of its section
Changing its value is discouraged, so move it out of sight.
---
docs/magit.org | 24 ++++++++++++------------
docs/magit.texi | 26 ++++++++++++--------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index d25f9644ff3..7c851be4447 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -4073,18 +4073,6 @@ These commands can only be used when point is inside a
diff.
The buffer is displayed in the selected window. With a prefix
argument the buffer is displayed in another window instead.
-- User Option: magit-diff-visit-previous-blob ::
-
- This option controls whether ~magit-diff-visit-file~ may visit the
- previous blob. When this is ~t~ (the default) and point is on a
- removed line in a diff for a committed change, then
- ~magit-diff-visit-file~ visits the blob from the last revision which
- still had that line.
-
- Currently this is only supported for committed changes, for staged
- and unstaged changes ~magit-diff-visit-file~ always visits the file in
- the working tree.
-
- Key: C-<return> (magit-diff-visit-worktree-file) ::
This command visits the worktree version of the appropriate file.
@@ -4114,6 +4102,18 @@ argument.
These commands behave like the respective commands described above,
except that they display the blob or file in another window or frame.
+- User Option: magit-diff-visit-previous-blob ::
+
+ This option controls whether ~magit-diff-visit-file~ may visit the
+ previous blob. When this is ~t~ (the default) and point is on a
+ removed line in a diff for a committed change, then
+ ~magit-diff-visit-file~ visits the blob from the last revision which
+ still had that line.
+
+ Currently this is only supported for committed changes, for staged
+ and unstaged changes ~magit-diff-visit-file~ always visits the file in
+ the working tree.
+
** Blaming
Also see [[man:git-blame]]
diff --git a/docs/magit.texi b/docs/magit.texi
index 05910a58a89..e17caec4842 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -4796,21 +4796,7 @@ corresponds to the line that point is on in the diff.
The buffer is displayed in the selected window. With a prefix
argument the buffer is displayed in another window instead.
-@end table
-
-@defopt magit-diff-visit-previous-blob
-This option controls whether @code{magit-diff-visit-file} may visit the
-previous blob. When this is @code{t} (the default) and point is on a
-removed line in a diff for a committed change, then
-@code{magit-diff-visit-file} visits the blob from the last revision which
-still had that line.
-
-Currently this is only supported for committed changes, for staged
-and unstaged changes @code{magit-diff-visit-file} always visits the file in
-the working tree.
-@end defopt
-@table @asis
@item @kbd{C-<return>} (@code{magit-diff-visit-worktree-file})
@kindex C-<return>
@findex magit-diff-visit-worktree-file
@@ -4845,6 +4831,18 @@ These commands behave like the respective commands
described above,
except that they display the blob or file in another window or frame.
@end deffn
+@defopt magit-diff-visit-previous-blob
+This option controls whether @code{magit-diff-visit-file} may visit the
+previous blob. When this is @code{t} (the default) and point is on a
+removed line in a diff for a committed change, then
+@code{magit-diff-visit-file} visits the blob from the last revision which
+still had that line.
+
+Currently this is only supported for committed changes, for staged
+and unstaged changes @code{magit-diff-visit-file} always visits the file in
+the working tree.
+@end defopt
+
@node Blaming
@section Blaming
