daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-03-11 21:14:26 +01:00
parent 45d49daef0
commit 14dcaaddde
440 changed files with 13229 additions and 8718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lisp/magit/magit-diff.el
View File

@@ -193,8 +193,8 @@ keep their distinct foreground colors."
(defcustom magit-diff-refine-hunk nil
"Whether to show word-granularity differences within diff hunks.
nil Never show fine differences.
t Show fine differences for the current diff hunk only.
`nil' Never show fine differences.
`t' Show fine differences for the current diff hunk only.
`all' Show fine differences for all displayed diff hunks."
:group 'magit-diff
:safe (lambda (val) (memq val '(nil t all)))
@@ -217,13 +217,13 @@ t Show fine differences for the current diff hunk only.
Determining the correct width can be expensive if it requires
opening large and/or many files, so the widths are cached in
the variable `magit-diff--tab-width-cache'. Set that to nil
the variable `magit-diff--tab-width-cache'. Set that to `nil'
to invalidate the cache.
nil Never adjust tab width. Use `tab-width's value from
`nil' Never adjust tab width. Use `tab-width's value from
the Magit buffer itself instead.
t If the corresponding file-visiting buffer exits, then
`t' If the corresponding file-visiting buffer exits, then
use `tab-width's value from that buffer. Doing this is
cheap, so this value is used even if a corresponding
cache entry exists.
@@ -243,8 +243,8 @@ NUMBER Like `always', but don't visit files larger than NUMBER
(defcustom magit-diff-paint-whitespace t
"Specify where to highlight whitespace errors.
nil Never highlight whitespace errors.
t Highlight whitespace errors everywhere.
`nil' Never highlight whitespace errors.
`t' Highlight whitespace errors everywhere.
`uncommitted' Only highlight whitespace errors in diffs
showing uncommitted changes.
@@ -266,15 +266,15 @@ whitespace errors are highlighted."
(defcustom magit-diff-paint-whitespace-lines t
"Specify in what kind of lines to highlight whitespace errors.
t Highlight only in added lines.
`t' Highlight only in added lines.
`both' Highlight in added and removed lines.
`all' Highlight in added, removed and context lines."
:package-version '(magit . "3.0.0")
:group 'magit-diff
:safe (lambda (val) (memq val '(t both all)))
:type '(choice (const :tag "in added lines" t)
(const :tag "in added and removed lines" both)
(const :tag "in added, removed and context lines" all)))
:type '(choice (const :tag "In added lines" t)
(const :tag "In added and removed lines" both)
(const :tag "In added, removed and context lines" all)))
(defcustom magit-diff-highlight-trailing t
"Whether to highlight whitespace at the end of a line in diffs.
@@ -412,8 +412,8 @@ subject to option `magit-revision-insert-related-refs'."
(defcustom magit-revision-insert-related-refs t
"Whether to show related branches in revision buffers.
nil Don't show any related branches.
t Show related local branches.
`nil' Don't show any related branches.
`t' Show related local branches.
`all' Show related local and remote branches.
`mixed' Show all containing branches and local merged branches.
@@ -421,10 +421,10 @@ See user option `magit-revision-insert-related-refs-display-alist'
to hide specific sets of related branches."
:package-version '(magit . "2.1.0")
:group 'magit-revision
:type '(choice (const :tag "don't" nil)
(const :tag "local only" t)
(const :tag "all related" all)
(const :tag "all containing, local merged" mixed)))
:type '(choice (const :tag "Do not" nil)
(const :tag "Local only" t)
(const :tag "All related" all)
(const :tag "All containing, local merged" mixed)))
(defcustom magit-revision-insert-related-refs-display-alist nil
"How `magit-insert-revision-headers' displays related branch types.
@@ -433,11 +433,11 @@ This is an alist, with recognised keys being the symbols
`parents', `merged', `contained', `follows', and `precedes';
and the supported values for each key being:
nil Hide these related branches.
t Show these related branches.
`nil' Hide these related branches.
`t' Show these related branches.
Keys which are not present in the alist have an implicit value t
\(so the default alist value of nil means all related branch types
Keys which are not present in the alist have an implicit value `t'
\(so the default alist value of `nil' means all related branch types
will be shown.)
The types to be shown are additionally subject to user option
@@ -465,7 +465,7 @@ performance and reliability:
long and which contain at least one number as well as at least
one letter.
If nil, then no hashes are turned into sections, but you can
If `nil', then no hashes are turned into sections, but you can
still visit the commit at point using \"RET\"."
:package-version '(magit . "2.12.0")
:group 'magit-revision
@@ -478,9 +478,9 @@ still visit the commit at point using \"RET\"."
(defcustom magit-revision-show-gravatars nil
"Whether to show gravatar images in revision buffers.
If nil, then don't insert any gravatar images. If t, then insert
both images. If `author' or `committer', then insert only the
respective image.
If `nil', then don't insert any gravatar images. If `t', then
insert both images. If `author' or `committer', then insert
only the respective image.
If you have customized the option `magit-revision-header-format'
and want to insert the images then you might also have to specify
@@ -489,7 +489,7 @@ two regular expressions. The car specifies where to insert the
author's image. The top half of the image is inserted right
after the matched text, the bottom half on the next line in the
same column. The cdr specifies where to insert the committer's
image, accordingly. Either the car or the cdr may be nil."
image, accordingly. Either the car or the cdr may be `nil'."
:package-version '(magit . "2.3.0")
:group 'magit-revision
:type '(choice