Skip to content

Commit

Permalink
Emacs package update
Browse files Browse the repository at this point in the history
  • Loading branch information
laurynas-biveinis committed Dec 7, 2024
1 parent 2512c2e commit 06176aa
Show file tree
Hide file tree
Showing 117 changed files with 1,300 additions and 718 deletions.
2 changes: 1 addition & 1 deletion emacs/.emacs.d/elpa/archives/gnu/archive-contents.signed
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-06T00:05:03+0200 using EDDSA
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-07T00:05:02+0200 using EDDSA
20 changes: 10 additions & 10 deletions emacs/.emacs.d/elpa/archives/melpa-stable/archive-contents

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions emacs/.emacs.d/elpa/archives/melpa/archive-contents

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion emacs/.emacs.d/elpa/archives/nongnu-elpa/archive-contents
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,16 @@
(:authors
("EditorConfig Team" . "editorconfig@googlegroups.com"))
(:commit . "f1531bab5b57e40759167b7e5db49acbbc09972f"))])
(eglot-inactive-regions .
[(0 6 3)
((emacs
(29 1)))
"Highlight inactive code regions with eglot power" tar
((:url . "https://github.com/fargiolas/eglot-inactive-regions")
(:maintainer "Filippo Argiolas" . "filippo.argiolas@gmail.com")
(:authors
("Filippo Argiolas" . "filippo.argiolas@gmail.com"))
(:commit . "2c83a3230d4ee9336b0311dbaa6fa77c2d2538c6"))])
(elixir-mode .
[(2 5 0)
((emacs
Expand Down Expand Up @@ -2028,7 +2038,7 @@
("David Christiansen" . "david@davidchristiansen.dk"))
(:commit . "1edda80e2e32b72e77f4f16ae5b83c312c68ee95"))])
(racket-mode .
[(1 0 20241129 85359)
[(1 0 20241206 91913)
((emacs
(25 1)))
"Racket editing, REPL, and more" tar
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-06T00:10:07+0200 using EDDSA
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-07T00:10:03+0200 using EDDSA
12 changes: 11 additions & 1 deletion emacs/.emacs.d/elpa/archives/nongnu/archive-contents
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,16 @@
(:authors
("EditorConfig Team" . "editorconfig@googlegroups.com"))
(:commit . "f1531bab5b57e40759167b7e5db49acbbc09972f"))])
(eglot-inactive-regions .
[(0 6 3)
((emacs
(29 1)))
"Highlight inactive code regions with eglot power" tar
((:url . "https://github.com/fargiolas/eglot-inactive-regions")
(:maintainer "Filippo Argiolas" . "filippo.argiolas@gmail.com")
(:authors
("Filippo Argiolas" . "filippo.argiolas@gmail.com"))
(:commit . "2c83a3230d4ee9336b0311dbaa6fa77c2d2538c6"))])
(elixir-mode .
[(2 5 0)
((emacs
Expand Down Expand Up @@ -2028,7 +2038,7 @@
("David Christiansen" . "david@davidchristiansen.dk"))
(:commit . "1edda80e2e32b72e77f4f16ae5b83c312c68ee95"))])
(racket-mode .
[(1 0 20241129 85359)
[(1 0 20241206 91913)
((emacs
(25 1)))
"Racket editing, REPL, and more" tar
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-06T00:10:07+0200 using EDDSA
Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) <elpasign@elpa.gnu.org> (trust undefined) created at 2024-12-07T00:10:03+0200 using EDDSA
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1801,11 +1801,16 @@ while two prefix arguments are equivalent to `--all'.
(autoload 'magit-stash-apply "magit-stash" "\
Apply a stash to the working tree.
When using a Git release before v2.38.0, simply run \"git stash
apply\" or with a prefix argument \"git stash apply --index\".
When using Git v2.38.0 or later, behave more intelligently:
First try \"git stash apply --index\", which tries to preserve
the index stored in the stash, if any. This may fail because
applying the stash could result in conflicts and those have to
be stored in the index, making it impossible to also store the
stash's index there as well.
stash's index there.
If the above failed, then try \"git stash apply\". This fails
(with or without \"--index\") if there are any uncommitted
Expand All @@ -1821,11 +1826,16 @@ the user whether to use \"--3way\" or \"--reject\".
(autoload 'magit-stash-pop "magit-stash" "\
Apply a stash to the working tree, on success remove it from stash list.
When using a Git release before v2.38.0, simply run \"git stash
pop\" or with a prefix argument \"git stash pop --index\".
When using Git v2.38.0 or later, behave more intelligently:
First try \"git stash pop --index\", which tries to preserve
the index stored in the stash, if any. This may fail because
applying the stash could result in conflicts and those have to
be stored in the index, making it impossible to also store the
stash's index there as well.
stash's index there.
If the above failed, then try \"git stash apply\". This fails
(with or without \"--index\") if there are any uncommitted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

;;; Code:

(require 'magit-git)
(require 'magit-process)

(require 'autorevert)

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,10 @@ See info node `(magit)Debugging Tools' for more information."
#'shell-quote-argument
`(,(concat invocation-directory invocation-name)
"-Q" "--eval" "(setq debug-on-error t)"
,@(cl-mapcan
,@(mapcan
(lambda (dir) (list "-L" dir))
(delete-dups
(cl-mapcan
(mapcan
(lambda (lib)
(if-let ((path (locate-library lib)))
(list (file-name-directory path))
Expand Down Expand Up @@ -911,11 +911,11 @@ as STRING."
(i 0))
`(let ((,s ,string))
(let ,(save-match-data
(cl-mapcan (lambda (sym)
(cl-incf i)
(and (not (eq (aref (symbol-name sym) 0) ?_))
(list (list sym (list 'match-string i s)))))
varlist))
(mapcan (lambda (sym)
(cl-incf i)
(and (not (eq (aref (symbol-name sym) 0) ?_))
(list (list sym (list 'match-string i s)))))
varlist))
,@body))))

(defun magit-delete-line ()
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,11 @@ has to be used to view and change branch related variables."
(transient-define-prefix magit-branch (branch)
"Add, configure or remove a branch."
:man-page "git-branch"
[:if (lambda ()
(and magit-branch-direct-configure
(oref (transient-prefix-object) scope)))
[:if (lambda () (and magit-branch-direct-configure (transient-scope)))
:description
(lambda ()
(concat (propertize "Configure " 'face 'transient-heading)
(propertize (oref (transient-prefix-object) scope)
'face 'magit-branch-local)))
(propertize (transient-scope) 'face 'magit-branch-local)))
("d" magit-branch.<branch>.description)
("u" magit-branch.<branch>.merge/remote)
("r" magit-branch.<branch>.rebase)
Expand Down Expand Up @@ -859,8 +856,7 @@ and also rename the respective reflog file."
[:description
(lambda ()
(concat (propertize "Configure " 'face 'transient-heading)
(propertize (oref (transient-prefix-object) scope)
'face 'magit-branch-local)))
(propertize (transient-scope) 'face 'magit-branch-local)))
("d" magit-branch.<branch>.description)
("u" magit-branch.<branch>.merge/remote)
("r" magit-branch.<branch>.rebase)
Expand Down Expand Up @@ -903,28 +899,27 @@ and also rename the respective reflog file."
:class 'magit--git-branch:upstream)

(cl-defmethod transient-init-value ((obj magit--git-branch:upstream))
(when-let* ((branch (oref (transient-prefix-object) scope))
(when-let* ((branch (transient-scope))
(remote (magit-get "branch" branch "remote"))
(merge (magit-get "branch" branch "merge")))
(oset obj value (list remote merge))))

(cl-defmethod transient-infix-read ((obj magit--git-branch:upstream))
(if (oref obj value)
(oset obj value nil)
(magit-read-upstream-branch (oref (transient-prefix-object) scope)
"Upstream")))
(magit-read-upstream-branch (transient-scope) "Upstream")))

(cl-defmethod transient-infix-set ((obj magit--git-branch:upstream) refname)
(magit-set-upstream-branch (oref (transient-prefix-object) scope) refname)
(magit-set-upstream-branch (transient-scope) refname)
(oset obj value
(and-let* ((branch (oref (transient-prefix-object) scope))
(and-let* ((branch (transient-scope))
(r (magit-get "branch" branch "remote"))
(m (magit-get "branch" branch "merge")))
(list r m)))
(magit-refresh))

(cl-defmethod transient-format ((obj magit--git-branch:upstream))
(let ((branch (oref (transient-prefix-object) scope)))
(let ((branch (transient-scope)))
(format-spec
(oref obj format)
`((?k . ,(transient-format-key obj))
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
(declare-function magit-merge-in-progress-p "magit-merge" ())
(declare-function magit--merge-range "magit-merge" (&optional head))
;; For `magit-diff--dwim'
(declare-function forge--pullreq-range "forge-pullreq"
(declare-function forge--pullreq-range "ext:forge-pullreq"
(pullreq &optional endpoints))
(declare-function forge--pullreq-ref "forge-pullreq" (pullreq))
(declare-function forge--pullreq-ref "ext:forge-pullreq" (pullreq))
;; For `magit-diff-wash-diff'
(declare-function ansi-color-apply-on-region "ansi-color")
;; For `magit-diff-wash-submodule'
Expand Down Expand Up @@ -2156,7 +2156,9 @@ keymap is the parent of their keymaps."
(append magit-diff--reset-non-color-moved
magit-git-global-arguments)))
(magit--git-wash #'magit-diff-wash-diffs
(if (member "--no-index" args) 'wash-anyway keep-error)
(if (member "--no-index" args)
'wash-anyway
(or keep-error magit--git-wash-keep-error))
cmd args)))

(defun magit-diff--maybe-add-stat-arguments (args)
Expand Down Expand Up @@ -3195,24 +3197,26 @@ are highlighted."
(_ (magit-section-highlight section nil))))

(defun magit-diff-highlight-list (section &optional selection)
(let ((beg (oref section start))
(cnt (oref section content))
(end (oref section end)))
(when (or (eq this-command #'mouse-drag-region)
(not selection))
(unless (and (region-active-p)
(<= (region-beginning) beg))
(magit-section-make-overlay beg cnt 'magit-section-highlight))
(if (oref section hidden)
(oset section washer #'ignore)
(dolist (child (oref section children))
(when (or (eq this-command #'mouse-drag-region)
(not (and (region-active-p)
(<= (region-beginning)
(oref child start)))))
(magit-diff-highlight-recursive child selection)))))
(when magit-diff-highlight-hunk-body
(magit-section-make-overlay (1- end) end 'magit-section-highlight))))
(if (oref section children)
(let ((beg (oref section start))
(cnt (oref section content))
(end (oref section end)))
(when (or (eq this-command #'mouse-drag-region)
(not selection))
(unless (and (region-active-p)
(<= (region-beginning) beg))
(magit-section-make-overlay beg cnt 'magit-section-highlight))
(if (oref section hidden)
(oset section washer #'ignore)
(dolist (child (oref section children))
(when (or (eq this-command #'mouse-drag-region)
(not (and (region-active-p)
(<= (region-beginning)
(oref child start)))))
(magit-diff-highlight-recursive child selection)))))
(when magit-diff-highlight-hunk-body
(magit-section-make-overlay (1- end) end 'magit-section-highlight)))
(magit-section-highlight section nil)))

(defun magit-diff-highlight-file (section &optional selection)
(magit-diff-highlight-heading section selection)
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,12 @@ insert the run command and stderr into the process buffer."
(insert-file-contents log)
(goto-char (point-max))
(setq errmsg
(if (functionp magit-git-debug)
(funcall magit-git-debug (buffer-string))
(magit--locate-error-message))))
(cond
((eq return-error 'full)
(buffer-string))
((functionp magit-git-debug)
(funcall magit-git-debug (buffer-string)))
((magit--locate-error-message)))))
(when magit-git-debug
(let ((magit-git-debug nil))
(with-current-buffer (magit-process-buffer t)
Expand Down Expand Up @@ -543,7 +546,7 @@ message and add a section in the respective process buffer."
(apply #'magit-git-insert args)
(split-string (buffer-string) "\0" t)))

(defvar magit--git-wash-keep-error nil) ; experimental
(defvar magit--git-wash-keep-error t)

(defun magit-git-wash (washer &rest args)
"Execute Git with ARGS, inserting washed output at point.
Expand All @@ -558,12 +561,11 @@ call function WASHER with ARGS as its sole argument."
(declare (indent 2))
(setq args (flatten-tree args))
(let ((beg (point))
(exit (magit--git-insert keep-error args)))
(exit (magit--git-insert (and keep-error 'full) args)))
(when (stringp exit)
(goto-char beg)
(insert (propertize exit 'face 'error))
(unless (bolp)
(insert "\n")))
(insert (if (bolp) "\n" "\n\n")))
(if (= (point) beg)
(magit-cancel-section)
(unless (bolp)
Expand Down Expand Up @@ -1258,10 +1260,15 @@ Sorted from longest to shortest CYGWIN name."
"Return t if there are any staged changes.
If optional FILES is non-nil, then only changes to those files
are considered."
;; The "--submodule=short" is needed to work around a bug in Git v2.46.0
;; and v2.46.1. See #5212 and #5221. There are actually two related
;; bugs, both of which are fixed in v2.46.2, with the following commits,
;; but there is no workaround for the second bug.
;; 11591850dd diff: report dirty submodules as changes in builtin_diff()
;; 87cf96094a diff: report copies and renames as changes in run_diff_cmd()
(magit-git-failure "diff" "--quiet" "--cached"
(if ignore-submodules
"--ignore-submodules"
;; Work around a bug in Git v2.46.0. See #5212 and #5221.
"--submodule=short")
"--" files))

Expand Down Expand Up @@ -2004,10 +2011,8 @@ SORTBY is a key or list of keys to pass to the `--sort' flag of

(defun magit-list-special-refnames ()
(let ((gitdir (magit-gitdir)))
(cl-mapcan (lambda (name)
(and (file-exists-p (expand-file-name name gitdir))
(list name)))
magit-special-refnames)))
(seq-keep (lambda (name) (file-exists-p (expand-file-name name gitdir)))
magit-special-refnames)))

(defun magit-list-branch-names ()
(magit-list-refnames (list "refs/heads" "refs/remotes")))
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
(when magit-refresh-verbose
(message "Refreshing buffer `%s'..." (buffer-name)))
(let* ((buffer (current-buffer))
(windows (cl-mapcan
(windows (mapcan
(lambda (window)
(with-selected-window window
(with-current-buffer buffer
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
;; -*- no-byte-compile: t; lexical-binding: nil -*-
(define-package "magit" "4.1.2"
(define-package "magit" "4.1.3"
"A Git porcelain inside Emacs."
'((emacs "26.1")
(compat "30.0.0.0")
(dash "2.19.1")
(magit-section "4.1.2")
(magit-section "4.1.3")
(seq "2.24")
(transient "0.7.8")
(with-editor "3.4.2"))
(transient "0.8.0")
(with-editor "3.4.3"))
:url "https://github.com/magit/magit"
:commit "4992c3d1f64e0e983692c7a61d47069f47380dbf"
:revdesc "v4.1.2-0-g4992c3d1f64e"
:commit "7adad8c8d3bd61ae36659638751223cfa2c7d720"
:revdesc "v4.1.3-0-g7adad8c8d3bd"
:keywords '("git" "tools" "vc")
:authors '(("Marius Vollmer" . "marius.vollmer@gmail.com")
("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,11 @@ itself from the hook, to avoid further futile attempts."
'("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
;; Match-group 99 is used to identify the "user@host" part.
"^\\(Enter \\|([^) ]+) \\)?\
[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$"
[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']+\\)'?\\)?: ?$"
"Please enter the passphrase for the ssh key"
"Please enter the passphrase to unlock the OpenPGP secret key"
"^.*'s password: ?$"
"^\\(?99:[^']+\\)\\('s\\)? password: ?$"
"^.+ password: ?$"
"^Token: $" ; For git-credential-manager-core (#4318).
"^Yubikey for .*: ?$"
"^Enter PIN for .*: ?$")
Expand Down Expand Up @@ -882,10 +883,6 @@ PARENT is used as the parent of the returned keymap."
"Use `auth-source-search' to get a password.
If found, return the password. Otherwise, return nil.

To use this function add it to the appropriate hook
(add-hook \\='magit-process-find-password-functions
\\='magit-process-password-auth-source)

KEY typically derives from a prompt such as:
Password for \\='https://yourname@github.com\\='
in which case it would be the string
Expand Down
Binary file not shown.
Loading

0 comments on commit 06176aa

Please sign in to comment.