daniel/emacs-conf
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

1
lisp/magit/AUTHORS.md
View File

@@ -103,6 +103,7 @@ All Contributors
- Clément Pit-Claudel
- Cornelius Mika
- Craig Andera
- Curt Brune
- Daanturo
- Dale Hagglund
- Damien Cassou

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

@@ -378,32 +378,32 @@ ignored) files."
"--" plain)
(when magit-auto-revert-mode
(mapc #'magit-turn-on-auto-revert-mode-if-desired plain)))
(dolist (repo repos)
(save-excursion
(goto-char (oref (magit-get-section
`((file . ,repo) (untracked) (status)))
start))
(when (and (fboundp 'borg-assimilate)
(fboundp 'borg--maybe-absorb-gitdir)
(fboundp 'borg--sort-submodule-sections))
(let* ((topdir (magit-toplevel))
(url (let ((default-directory
(file-name-as-directory (expand-file-name repo))))
(or (magit-get "remote" (magit-get-some-remote) "url")
(concat (file-name-as-directory ".") repo))))
(package
(and (equal borg-user-emacs-directory topdir)
(file-name-nondirectory (directory-file-name repo)))))
(if (and package
(y-or-n-p (format "Also assimilate `%s' drone?" package)))
(borg-assimilate package url)
(magit-submodule-add-1
url repo (magit-submodule-read-name-for-path repo package))
(when package
(borg--sort-submodule-sections
(expand-file-name ".gitmodules" topdir))
(let ((default-directory borg-user-emacs-directory))
(borg--maybe-absorb-gitdir package))))))))
(when (and (fboundp 'borg-assimilate)
(fboundp 'borg--maybe-absorb-gitdir)
(fboundp 'borg--sort-submodule-sections))
(dolist (repo repos)
(save-excursion
(when-let ((section (magit-get-section
`((file . ,repo) (untracked) (status)))))
(goto-char (oref section start))
(let* ((topdir (magit-toplevel))
(url (let ((default-directory
(file-name-as-directory (expand-file-name repo))))
(or (magit-get "remote" (magit-get-some-remote) "url")
(concat (file-name-as-directory ".") repo))))
(package
(and (equal borg-user-emacs-directory topdir)
(file-name-nondirectory (directory-file-name repo)))))
(if (and package
(y-or-n-p (format "Also assimilate `%s' drone?" package)))
(borg-assimilate package url)
(magit-submodule-add-1
url repo (magit-submodule-read-name-for-path repo package))
(when package
(borg--sort-submodule-sections
(expand-file-name ".gitmodules" topdir))
(let ((default-directory borg-user-emacs-directory))
(borg--maybe-absorb-gitdir package)))))))))
(magit-wip-commit-after-apply files " after stage")))
(defvar magit-post-stage-hook-commands

20
lisp/magit/magit-base.el
View File

@@ -129,11 +129,11 @@ The value has the form ((COMMAND nil|PROMPT DEFAULT)...).
:group 'magit-commands
:type '(repeat
(list (symbol :tag "Command") ; It might not be fboundp yet.
(choice (const :tag "for all prompts" nil)
(regexp :tag "for prompts matching regexp"))
(choice (const :tag "offer other choices" nil)
(const :tag "require confirmation" ask)
(const :tag "use default without confirmation" t)))))
(choice (const :tag "For all prompts" nil)
(regexp :tag "For prompts matching regexp"))
(choice (const :tag "Offer other choices" nil)
(const :tag "Require confirmation" ask)
(const :tag "Use default without confirmation" t)))))
(defconst magit--confirm-actions
'((const discard)
@@ -329,7 +329,7 @@ Various:
Global settings:
Instead of adding all of the above symbols to the value of this
option you can also set it to the atom t, which has the same
option you can also set it to the atom `t', which has the same
effect as adding all of the above symbols. Doing that most
certainly is a bad idea, especially because other symbols might
be added in the future. So even if you don't want to be asked
@@ -467,9 +467,9 @@ and delay of your graphical environment or operating system."
`woman' View the respective man-page using the `woman' package."
:package-version '(magit . "2.9.0")
:group 'magit-miscellaneous
:type '(choice (const :tag "view info manual" info)
(const :tag "view manpage using `man'" man)
(const :tag "view manpage using `woman'" woman)))
:type '(choice (const :tag "View info manual" info)
(const :tag "View manpage using `man'" man)
(const :tag "View manpage using `woman'" woman)))
;;; Section Classes
@@ -908,7 +908,7 @@ data, starting with 1 and incrementing by 1 for each symbol. If
the last match was against a string, then that has to be provided
as STRING."
(declare (indent 2) (debug (listp form body)))
(let ((s (cl-gensym "string"))
(let ((s (gensym "string"))
(i 0))
`(let ((,s ,string))
(let ,(save-match-data

20
lisp/magit/magit-branch.el
View File

@@ -38,17 +38,17 @@
(defcustom magit-branch-read-upstream-first t
"Whether to read upstream before name of new branch when creating a branch.
nil Read the branch name first.
t Read the upstream first.
`nil' Read the branch name first.
`t' Read the upstream first.
`fallback' Read the upstream first, but if it turns out that the chosen
value is not a valid upstream (because it cannot be resolved
as an existing revision), then treat it as the name of the
new branch and continue by reading the upstream next."
:package-version '(magit . "2.2.0")
:group 'magit-commands
:type '(choice (const :tag "read branch name first" nil)
(const :tag "read upstream first" t)
(const :tag "read upstream first, with fallback" fallback)))
:type '(choice (const :tag "Read branch name first" nil)
(const :tag "Read upstream first" t)
(const :tag "Read upstream first, with fallback" fallback)))
(defcustom magit-branch-prefer-remote-upstream nil
"Whether to favor remote upstreams when creating new branches.
@@ -154,10 +154,10 @@ However, I recommend that you use local branches as UPSTREAM."
:package-version '(magit . "2.9.0")
:group 'magit-commands
:type '(repeat (cons (string :tag "Use upstream")
(choice :tag "for branches"
(regexp :tag "matching")
(repeat :tag "except"
(string :tag "branch"))))))
(choice :tag "For branches" ;???
(regexp :tag "Matching")
(repeat :tag "Except"
(string :tag "Branch"))))))
(defcustom magit-branch-rename-push-target t
"Whether the push-remote setup is preserved when renaming a branch.
@@ -177,7 +177,7 @@ When t, then rename the branch named OLD on the remote specified
remote and unless NEW already exists on the remote.
When `forge-only' and the `forge' package is available, then
behave like t if the remote points to a repository on a forge
behave like `t' if the remote points to a repository on a forge
(currently Github or Gitlab), otherwise like `local-only'."
:package-version '(magit . "2.90.0")
:group 'magit-commands

12
lisp/magit/magit-clone.el
View File

@@ -43,9 +43,9 @@ If t, then set without asking. If nil, then don't set. If
`ask', then ask."
:package-version '(magit . "2.4.0")
:group 'magit-commands
:type '(choice (const :tag "set" t)
(const :tag "ask" ask)
(const :tag "don't set" nil)))
:type '(choice (const :tag "Set" t)
(const :tag "Ask" ask)
(const :tag "Don't set" nil)))
(defcustom magit-clone-default-directory nil
"Default directory to use when `magit-clone' reads destination.
@@ -54,9 +54,9 @@ If a directory, then use that. If a function, then call that
with the remote url as only argument and use the returned value."
:package-version '(magit . "2.90.0")
:group 'magit-commands
:type '(choice (const :tag "value of default-directory")
(directory :tag "constant directory")
(function :tag "function's value")))
:type '(choice (const :tag "Value of default-directory")
(directory :tag "Constant directory")
(function :tag "Function's value")))
(defcustom magit-clone-always-transient nil
"Whether `magit-clone' always acts as a transient prefix command.

5
lisp/magit/magit-commit.el
View File

@@ -148,7 +148,10 @@ Also see https://github.com/magit/magit/issues/4132."
("W" "Revise" magit-commit-revise)]
["Edit and rebase"
("F" "Instant fixup" magit-commit-instant-fixup)
("S" "Instant squash" magit-commit-instant-squash)]
("S" "Instant squash" magit-commit-instant-squash)
""
""
("R" "Reword past" magit-rebase-reword-commit :level 0)]
["Spread across commits"
("x" "Modified files" magit-commit-autofixup :level 6)
("X" "Updated modules" magit-commit-absorb-modules :level 6)]]

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

4
lisp/magit/magit-ediff.el
View File

@@ -181,8 +181,8 @@ is put in FILE."
(setq get (nreverse get))
(setq make (nreverse make))
(setq kill (nreverse kill))
(let ((mconf (cl-gensym "conf"))
(mfile (cl-gensym "file")))
(let ((mconf (gensym "conf"))
(mfile (gensym "file")))
`(magit-with-toplevel
(let ((,mconf (current-window-configuration))
(,mfile ,file)

8
lisp/magit/magit-git.el
View File

@@ -252,8 +252,8 @@ See info node `(magit)Debugging Tools' for more information."
(defmacro magit--with-refresh-cache (key &rest body)
(declare (indent 1) (debug (form body)))
(let ((k (cl-gensym))
(hit (cl-gensym)))
(let ((k (gensym))
(hit (gensym)))
`(if magit--refresh-cache
(let ((,k ,key))
(if-let ((,hit (assoc ,k (cdr magit--refresh-cache))))
@@ -299,7 +299,7 @@ propagated by `with-temp-buffer', so we explicitly ensure that
happens, so that processes will be invoked consistently. BODY is
as for that macro."
(declare (indent 0) (debug (body)))
(let ((p (cl-gensym)))
(let ((p (gensym)))
`(let ((,p process-environment))
(with-temp-buffer
(setq-local process-environment ,p)
@@ -2402,7 +2402,7 @@ and this option only controls what face is used.")
(defmacro magit-with-temp-index (tree arg &rest body)
(declare (indent 2) (debug (form form body)))
(let ((file (cl-gensym "file")))
(let ((file (gensym "file")))
`(let ((magit--refresh-cache nil)
(,file (magit-convert-filename-for-git
(make-temp-name

8
lisp/magit/magit-log.el
View File

@@ -262,10 +262,10 @@ The message can be shown in the `echo-area' or the `header-line', or in
be nil, in which case no usage information is shown."
:package-version '(magit . "2.1.0")
:group 'magit-log
:type '(choice (const :tag "in echo-area" echo-area)
(const :tag "in header-line" header-line)
(const :tag "in both places" both)
(const :tag "nowhere")))
:type '(choice (const :tag "In echo-area" echo-area)
(const :tag "In header-line" header-line)
(const :tag "In both places" both)
(const :tag "Nowhere")))
(defcustom magit-log-select-margin
(list (nth 0 magit-log-margin)

31
lisp/magit/magit-mode.el
View File

@@ -234,10 +234,10 @@ and Buffer Variables'."
:group 'magit-diff
:group 'magit-log
:type '(choice
(const :tag "always use args from buffer" always)
(const :tag "use args from buffer if displayed in frame" selected)
(const :tag "use args from buffer if it is current" current)
(const :tag "never use args from buffer" never)))
(const :tag "Always use args from buffer" always)
(const :tag "Use args from buffer if displayed in frame" selected)
(const :tag "Use args from buffer if it is current" current)
(const :tag "Never use args from buffer" never)))
(defcustom magit-direct-use-buffer-arguments 'selected
"Whether certain commands reuse arguments active in relevant buffer.
@@ -267,10 +267,10 @@ and Buffer Variables'."
:group 'magit-diff
:group 'magit-log
:type '(choice
(const :tag "always use args from buffer" always)
(const :tag "use args from buffer if displayed in frame" selected)
(const :tag "use args from buffer if it is current" current)
(const :tag "never use args from buffer" never)))
(const :tag "Always use args from buffer" always)
(const :tag "Use args from buffer if displayed in frame" selected)
(const :tag "Use args from buffer if it is current" current)
(const :tag "Never use args from buffer" never)))
(defcustom magit-region-highlight-hook
'(magit-diff-update-hunk-region) ; from magit-diff.el
@@ -1142,12 +1142,13 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
(defvar magit-after-save-refresh-buffers nil)
(defun magit-after-save-refresh-buffers ()
(dolist (buffer magit-after-save-refresh-buffers)
(when (buffer-live-p buffer)
(with-current-buffer buffer
(magit-refresh-buffer))))
(setq magit-after-save-refresh-buffers nil)
(remove-hook 'post-command-hook #'magit-after-save-refresh-buffers))
(unless magit-inhibit-refresh
(dolist (buffer magit-after-save-refresh-buffers)
(when (buffer-live-p buffer)
(with-current-buffer buffer
(magit-refresh-buffer))))
(setq magit-after-save-refresh-buffers nil)
(remove-hook 'post-command-hook #'magit-after-save-refresh-buffers)))
(defun magit-after-save-refresh-status ()
"Refresh the status buffer of the current repository.
@@ -1426,7 +1427,7 @@ repositories."
(defmacro magit--with-repository-local-cache (key &rest body)
(declare (indent 1) (debug (form body)))
(let ((k (cl-gensym)))
(let ((k (gensym)))
`(let ((,k ,key))
(if-let ((kv (magit-repository-local-exists-p ,k)))
(cdr kv)

6
lisp/magit/magit-patch.el
View File

@@ -40,12 +40,12 @@ a constant list of arguments, depending on this option and
the prefix argument."
:package-version '(magit . "2.12.0")
:group 'magit-diff
:type '(choice (const :tag "use buffer arguments" buffer)
(cons :tag "use buffer arguments except"
:type '(choice (const :tag "Use buffer arguments" buffer)
(cons :tag "Use buffer arguments except"
(const :format "" exclude)
(repeat :format "%v%i\n"
(string :tag "Argument")))
(repeat :tag "use constant arguments"
(repeat :tag "Use constant arguments"
(string :tag "Argument"))))
;;; Commands

10
lisp/magit/magit-pkg.el
View File

@@ -1,12 +1,12 @@
(define-package "magit" "20250221.105" "A Git porcelain inside Emacs"
(define-package "magit" "20250305.2342" "A Git porcelain inside Emacs"
'((emacs "27.1")
(compat "30.0.2.0")
(llama "0.6.0")
(magit-section "4.3.0")
(llama "0.6.1")
(magit-section "4.3.1")
(seq "2.24")
(transient "0.8.4")
(transient "0.8.5")
(with-editor "3.4.3"))
:commit "9914feb4d5a2feab091076be554d80781594869d" :authors
:commit "225ea6fd009300ba80e55a0162f3e46eb6e4f2d3" :authors
'(("Marius Vollmer" . "marius.vollmer@gmail.com")
("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
:maintainers

6
lisp/magit/magit-process.el
View File

@@ -49,8 +49,8 @@
If nil, use pipes: this is usually more efficient, and works on Cygwin.
If t, use ptys: this enables Magit to prompt for passphrases when needed."
:group 'magit-process
:type '(choice (const :tag "pipe" nil)
(const :tag "pty" t)))
:type '(choice (const :tag "Pipe" nil)
(const :tag "Pty" t)))
(defcustom magit-need-cygwin-noglob
(and (eq system-type 'windows-nt)
@@ -257,7 +257,7 @@ process section in the process buffer, and insert the returned
string in the heading of its section."
:package-version '(magit . "4.0.0")
:group 'magit-process
:type '(choice (const :tag "none" nil) string))
:type '(choice (const :tag "None" nil) string))
(defvar tramp-pipe-stty-settings)
(defvar magit-tramp-pipe-stty-settings ""

8
lisp/magit/magit-remote.el
View File

@@ -40,10 +40,10 @@ the name of the added remote is equal to that string and the
variable isn't already set."
:package-version '(magit . "2.4.0")
:group 'magit-commands
:type '(choice (const :tag "ask if unset" ask-if-unset)
(const :tag "always ask" ask)
(string :tag "set if named")
(const :tag "don't set")))
:type '(choice (const :tag "Ask if unset" ask-if-unset)
(const :tag "Always ask" ask)
(string :tag "Set if named")
(const :tag "Don't set")))
(defcustom magit-remote-direct-configure t
"Whether the command `magit-remote' shows Git variables.

4
lisp/magit/magit-sequence.el
View File

@@ -560,8 +560,8 @@ This discards all changes made since the sequence started."
("s" "a subset" magit-rebase-subset)]
[("m" "to modify a commit" magit-rebase-edit-commit)
("w" "to reword a commit" magit-rebase-reword-commit)
("k" "to remove a commit" magit-rebase-remove-commit)
("f" "to autosquash" magit-rebase-autosquash)
("k" "to remove a commit" magit-rebase-remove-commit)]
[("f" "to autosquash" magit-rebase-autosquash)
(6 "t" "to change dates" magit-reshelve-since)]]
["Actions"
:if magit-rebase-in-progress-p

14
lisp/magit/magit-status.el
View File

@@ -109,9 +109,9 @@ See option `magit-section-initial-visibility-alist' for how to
control the initial visibility of the jumped to section."
:package-version '(magit . "2.90.0")
:group 'magit-status
:type '(choice (const :tag "as usual" nil)
(repeat (choice (number :tag "nth top-level section")
(sexp :tag "section identity")))))
:type '(choice (const :tag "As usual" nil)
(repeat (choice (number :tag "Nth top-level section")
(sexp :tag "Section identity")))))
(defcustom magit-status-goto-file-position nil
"Whether to go to position corresponding to file position.
@@ -237,10 +237,10 @@ Valid values are:
:group 'magit-buffers
:group 'magit-commands
:type '(choice
(const :tag "always use args from buffer" always)
(const :tag "use args from buffer if displayed in frame" selected)
(const :tag "use args from buffer if it is current" current)
(const :tag "never use args from buffer" never)))
(const :tag "Always use args from buffer" always)
(const :tag "Use args from buffer if displayed in frame" selected)
(const :tag "Use args from buffer if it is current" current)
(const :tag "Never use args from buffer" never)))
;;; Commands

2
lisp/magit/magit-version.el
View File

@@ -1,6 +1,6 @@
;;; magit-version.el --- the Magit version you are using
(setq magit-version "4.3.0")
(setq magit-version "4.3.1")
(provide 'migit-version)

33
lisp/magit/magit-wip.el
View File

@@ -40,41 +40,12 @@
:group 'magit-modes
:group 'magit-essentials)
(defgroup magit-wip-legacy nil
"It is better to not use these modes individually."
:link '(info-link "(magit)Legacy Wip Modes")
:group 'magit-wip)
(defcustom magit-wip-mode-lighter " Wip"
"Lighter for Magit-Wip mode."
:package-version '(magit . "2.90.0")
:group 'magit-wip
:type 'string)
(defcustom magit-wip-after-save-local-mode-lighter ""
"Lighter for Magit-Wip-After-Save-Local mode."
:package-version '(magit . "2.1.0")
:group 'magit-wip-legacy
:type 'string)
(defcustom magit-wip-after-apply-mode-lighter ""
"Lighter for Magit-Wip-After-Apply mode."
:package-version '(magit . "2.1.0")
:group 'magit-wip-legacy
:type 'string)
(defcustom magit-wip-before-change-mode-lighter ""
"Lighter for Magit-Wip-Before-Change mode."
:package-version '(magit . "2.1.0")
:group 'magit-wip-legacy
:type 'string)
(defcustom magit-wip-initial-backup-mode-lighter ""
"Lighter for Magit-Wip-Initial Backup mode."
:package-version '(magit . "2.1.0")
:group 'magit-wip-legacy
:type 'string)
(defcustom magit-wip-merge-branch nil
"Whether to merge the current branch into its wip ref.
@@ -138,7 +109,6 @@ the current branch.
This mode should be enabled globally by turning on the globalized
variant `magit-wip-after-save-mode'."
:package-version '(magit . "2.1.0")
:lighter magit-wip-after-save-local-mode-lighter
(if magit-wip-after-save-local-mode
(if (and buffer-file-name (magit-inside-worktree-p t))
(add-hook 'after-save-hook #'magit-wip-commit-buffer-file t t)
@@ -205,7 +175,6 @@ in the worktree and the other contains snapshots of the entries
in the index."
:package-version '(magit . "2.1.0")
:group 'magit-wip
:lighter magit-wip-after-apply-mode-lighter
:global t)
(defun magit-wip-commit-after-apply (&optional files msg)
@@ -227,7 +196,6 @@ Only changes to files which could potentially be affected by the
command which is about to be called are committed."
:package-version '(magit . "2.1.0")
:group 'magit-wip
:lighter magit-wip-before-change-mode-lighter
:global t)
(defun magit-wip-commit-before-change (&optional files msg)
@@ -239,7 +207,6 @@ command which is about to be called are committed."
"Before saving a buffer for the first time, commit to a wip ref."
:package-version '(magit . "2.90.0")
:group 'magit-wip
:lighter magit-wip-initial-backup-mode-lighter
:global t
(if magit-wip-initial-backup-mode
(add-hook 'before-save-hook #'magit-wip-commit-initial-backup)

8
lisp/magit/magit.el
View File

@@ -17,14 +17,14 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: git tools vc
;; Package-Version: 4.3.0
;; Package-Version: 4.3.1
;; Package-Requires: (
;; (emacs "27.1")
;; (compat "30.0.2.0")
;; (llama "0.6.0")
;; (magit-section "4.3.0")
;; (llama "0.6.1")
;; (magit-section "4.3.1")
;; (seq "2.24")
;; (transient "0.8.4")
;; (transient "0.8.5")
;; (with-editor "3.4.3"))
;; SPDX-License-Identifier: GPL-3.0-or-later

866
lisp/magit/magit.info
View File

File diff suppressed because it is too large Load Diff