Commit 4f48241f authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-blame to magit-blame-addition

See #3619.
parent 51f946f2
......@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
#+SUBTITLE: for version 2.13.0 (2.13.0-302-ge4ba1386f+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-303-g51f946f24+1)
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
#+TEXINFO_DEFFN: t
......@@ -23,7 +23,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
#+TEXINFO: @noindent
This manual is for Magit version 2.13.0 (2.13.0-302-ge4ba1386f+1).
This manual is for Magit version 2.13.0 (2.13.0-303-g51f946f24+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -3463,7 +3463,7 @@ blob-visiting buffers. You can also enter the blame popup from the
file popup, which is available on ~C-c M-g~, provided ~magit-file-mode~
is enabled, see [[*Minor Mode for Buffers Visiting Files]].
- Command: magit-blame
- Command: magit-blame-addition
This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about what commits
......@@ -3480,9 +3480,9 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
- Command: magit-blame-echo
This command is like ~magit-blame~ except that it doesn't turn on
~read-only-mode~ and that it initially uses the visualization style
specified by option ~magit-blame-echo-style~.
This command is like ~magit-blame-addition~ except that it doesn't
turn on ~read-only-mode~ and that it initially uses the visualization
style specified by option ~magit-blame-echo-style~.
- Command: magit-blame-removal
......@@ -3490,7 +3490,7 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
blob-visiting buffer with information about the revision that
removes it. It cannot be used in file-visiting buffers.
Like ~magit-blame~, this command can be used recursively.
Like ~magit-blame-addition~, this command can be used recursively.
- Command: magit-blame-reverse
......@@ -3498,7 +3498,7 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
file- or blob-visiting buffer with information about the last
revision in which a line still existed.
Like ~magit-blame~, this command can be used recursively.
Like ~magit-blame-addition~, this command can be used recursively.
The following key bindings are available when Magit-Blame mode is
enabled and Read-Only mode is not enabled. These commands are also
......@@ -6583,7 +6583,7 @@ few key bindings, but this might be extended in the future.
This prefix command shows all blaming suffix command along with the
appropriate infix arguments in a popup buffer. See [[*Blaming]].
- Key: C-c M-g b, magit-blame
- Key: C-c M-g b, magit-blame-addition
This command shows for each line the revision in which it was added.
......
......@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.13.0 (2.13.0-302-ge4ba1386f+1)
@subtitle for version 2.13.0 (2.13.0-303-g51f946f24+1)
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
......@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
This manual is for Magit version 2.13.0 (2.13.0-302-ge4ba1386f+1).
This manual is for Magit version 2.13.0 (2.13.0-303-g51f946f24+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -4710,8 +4710,8 @@ blob-visiting buffers. You can also enter the blame popup from the
file popup, which is available on @code{C-c M-g}, provided @code{magit-file-mode}
is enabled, see @ref{Minor Mode for Buffers Visiting Files}.
@cindex magit-blame
@deffn Command magit-blame
@cindex magit-blame-addition
@deffn Command magit-blame-addition
This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about what commits
......@@ -4730,9 +4730,9 @@ added the current line or chunk of lines.
@cindex magit-blame-echo
@deffn Command magit-blame-echo
This command is like @code{magit-blame} except that it doesn't turn on
@code{read-only-mode} and that it initially uses the visualization style
specified by option @code{magit-blame-echo-style}.
This command is like @code{magit-blame-addition} except that it doesn't
turn on @code{read-only-mode} and that it initially uses the visualization
style specified by option @code{magit-blame-echo-style}.
@end deffn
@cindex magit-blame-removal
......@@ -4742,7 +4742,7 @@ This command augments each line or chunk of lines in the current
blob-visiting buffer with information about the revision that
removes it. It cannot be used in file-visiting buffers.
Like @code{magit-blame}, this command can be used recursively.
Like @code{magit-blame-addition}, this command can be used recursively.
@end deffn
@cindex magit-blame-reverse
......@@ -4752,7 +4752,7 @@ This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about the last
revision in which a line still existed.
Like @code{magit-blame}, this command can be used recursively.
Like @code{magit-blame-addition}, this command can be used recursively.
@end deffn
The following key bindings are available when Magit-Blame mode is
......@@ -8990,8 +8990,8 @@ This prefix command shows all blaming suffix command along with the
appropriate infix arguments in a popup buffer. See @ref{Blaming}.
@kindex C-c M-g b
@cindex magit-blame
@item @kbd{C-c M-g b} @tie{}@tie{}@tie{}@tie{}(@code{magit-blame})
@cindex magit-blame-addition
@item @kbd{C-c M-g b} @tie{}@tie{}@tie{}@tie{}(@code{magit-blame-addition})
This command shows for each line the revision in which it was added.
......
......@@ -267,7 +267,7 @@ in `magit-blame-read-only-mode-map' instead.")
(define-key map (kbd "I") 'magit-blame-previous-chunk-same-commit)
(define-key map (kbd "k") 'magit-blame-next-chunk)
(define-key map (kbd "K") 'magit-blame-next-chunk-same-commit)
(define-key map (kbd "j") 'magit-blame)
(define-key map (kbd "j") 'magit-blame-addition)
(define-key map (kbd "l") 'magit-blame-removal)
(define-key map (kbd "f") 'magit-blame-reverse)
(define-key map (kbd "b") 'magit-blame-popup))
......@@ -277,7 +277,7 @@ in `magit-blame-read-only-mode-map' instead.")
(define-key map (kbd "P") 'magit-blame-previous-chunk-same-commit)
(define-key map (kbd "n") 'magit-blame-next-chunk)
(define-key map (kbd "N") 'magit-blame-next-chunk-same-commit)
(define-key map (kbd "b") 'magit-blame)
(define-key map (kbd "b") 'magit-blame-addition)
(define-key map (kbd "r") 'magit-blame-removal)
(define-key map (kbd "f") 'magit-blame-reverse)
(define-key map (kbd "B") 'magit-blame-popup)))
......@@ -720,12 +720,12 @@ not turn on `read-only-mode'."
(cons 'eldoc-mode magit-blame-disable-modes))
(if (not magit-blame-mode)
(let ((magit-blame-read-only nil))
(magit-blame))
(magit-blame-addition))
(read-only-mode -1)
(magit-blame--update-overlays)))
;;;###autoload
(defun magit-blame ()
(defun magit-blame-addition ()
"For each line show the revision in which it was added."
(interactive)
(magit-blame--pre-blame-assert 'addition)
......@@ -882,7 +882,7 @@ instead of the hash, like `kill-ring-save' would."
:options '((?M "Detect lines moved or copied within a file" "-M")
(?C "Detect lines moved or copied between files" "-C"))
:actions '("Actions"
(?b "Show commits adding lines" magit-blame)
(?b "Show commits adding lines" magit-blame-addition)
(?r (lambda ()
(with-current-buffer magit-pre-popup-buffer
(and (not buffer-file-name)
......@@ -902,7 +902,7 @@ instead of the hash, like `kill-ring-save' would."
(?c "Cycle style" magit-blame-cycle-style))
:default-arguments '("-w")
:max-action-columns 1
:default-action 'magit-blame)
:default-action 'magit-blame-addition)
;;; Utilities
......
......@@ -233,7 +233,7 @@ directory, while reading the FILENAME."
(?u "Unstage" magit-unstage-file)
(?d "Diff" magit-diff-buffer-file)
(?l "Log" magit-log-buffer-file)
(?b "Blame" magit-blame)
(?b "Blame" magit-blame-addition)
(?p "Prev blob" magit-blob-previous)
(?c "Commit" magit-commit-popup) nil
(?t "Trace" magit-log-trace-definition)
......@@ -292,13 +292,13 @@ Currently this only adds the following key bindings.
(cond ((featurep 'jkl)
(define-key map "i" 'magit-blob-previous)
(define-key map "k" 'magit-blob-next)
(define-key map "j" 'magit-blame)
(define-key map "j" 'magit-blame-addition)
(define-key map "l" 'magit-blame-removal)
(define-key map "f" 'magit-blame-reverse))
(t
(define-key map "p" 'magit-blob-previous)
(define-key map "n" 'magit-blob-next)
(define-key map "b" 'magit-blame)
(define-key map "b" 'magit-blame-addition)
(define-key map "r" 'magit-blame-removal)
(define-key map "f" 'magit-blame-reverse)))
(define-key map "q" 'magit-kill-this-buffer)
......
......@@ -38,6 +38,7 @@
(define-obsolete-function-alias 'magit-fetch 'magit-fetch-other "Magit 2.90.0")
(define-obsolete-function-alias 'magit-pull 'magit-pull-branch "Magit 2.90.0")
(define-obsolete-function-alias 'magit-rebase 'magit-rebase-branch "Magit 2.90.0")
(define-obsolete-function-alias 'magit-blame 'magit-blame-addition "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment