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
2026-06-27 11:34:21 +02:00
parent 4be4f859c4
commit 1aaef48596
246 changed files with 7997 additions and 4359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lisp/magit/magit-log.el
+22 -21
View File
@@ -79,10 +79,10 @@
:type 'hook)
(defcustom magit-log-remove-graph-args '("--follow" "-G" "-S" "-L")
"The log arguments that cause the `--graph' argument to be dropped.
"The log arguments that cause the \"--graph\" argument to be dropped.
The default value lists the arguments that are incompatible with
`--graph' and therefore must be dropped when that is used. You
\"--graph\" and therefore must be dropped when that is used. You
can add additional arguments that are available in `magit-log',
but I recommend that you don't do that. Nowadays I would define
this as a constant, but I am preserving it as an option, in case
@@ -209,7 +209,7 @@ because the latter may make use of Imenu's outdated cache."
(defcustom magit-log-color-graph-limit 256
"Number of commits over which log graphs are not colored.
When showing more commits than specified, then the `--color'
When showing more commits than specified, then the \"--color\"
argument is silently dropped. This is necessary because the
`ansi-color' library, which is used to turn control sequences
into faces, is just too slow."
@@ -220,7 +220,7 @@ into faces, is just too slow."
(defcustom magit-log-show-signatures-limit 256
"Number of commits over which signatures are not verified.
When showing more commits than specified by this option, then the
`--show-signature' argument, if specified, is silently dropped.
\"--show-signature\" argument, if specified, is silently dropped.
This is necessary because checking the signature of a large
number of commits is just too slow."
:package-version '(magit . "4.0.0")
@@ -778,7 +778,7 @@ completion candidates."
;;;###autoload
(defun magit-log-buffer-file (&optional follow beg end)
"Show log for the blob or file visited in the current buffer.
With a prefix argument or when `--follow' is an active log
With a prefix argument or when \"--follow\" is an active log
argument, then follow renames. When the region is active,
restrict the log to the lines that the region touches."
(interactive (cons current-prefix-arg (magit-file-region-line-numbers)))
@@ -891,7 +891,7 @@ https://github.com/mhagger/git-when-merged."
(defun magit-delete-shelved-branch (branch)
"Delete the shelved BRANCH.
Delete a ref created by `magit-branch-shelve'."
(interactive (list (magit-read-shelved-branch "Log shelved branch")))
(interactive (list (magit-read-shelved-branch "Delete shelved branch")))
(magit-run-git "update-ref" "-d" (concat "refs/shelved/" branch)))
;;;; Limit Commands
@@ -1416,7 +1416,7 @@ Do not add this to a hook variable."
(cl-defun magit-log-wash-rev (style abbrev)
(when (derived-mode-p 'magit-log-mode 'magit-reflog-mode)
(cl-incf magit-log-count))
(incf magit-log-count))
(looking-at (pcase style
('log magit-log-heading-re)
('cherry magit-log-cherry-re)
@@ -1546,17 +1546,17 @@ Do not add this to a hook variable."
(delete-char (if (looking-at "\n") 1 4))
(magit-diff-wash-diffs (list "--stat") limit))
(when align
(setq align (make-string (1+ abbrev) ? )))
(setq align (make-string (1+ abbrev) ?\s)))
(when (and (not (eobp)) (not (looking-at non-graph-re)))
(when align
(setq align (make-string (1+ abbrev) ? )))
(setq align (make-string (1+ abbrev) ?\s)))
(while (and (not (eobp)) (not (looking-at non-graph-re)))
(when align
(save-excursion (insert align)))
(forward-line)
(magit-make-margin-overlay))
;; When `--format' is used and its value isn't one of the
;; predefined formats, then `git-log' does not insert a
;; When "--format" is used and its value isn't one of the
;; predefined formats, then "git log" does not insert a
;; separator line.
(save-excursion
(forward-line -1)
@@ -1590,6 +1590,7 @@ exists mostly for backward compatibility reasons."
(magit-section-forward)))
(add-hook 'magit-section-movement-hook #'magit-log-maybe-show-more-commits)
(add-hook 'magit-mouse-set-point-hook #'magit-log-maybe-show-more-commits)
(defvar magit--update-revision-buffer nil)
@@ -1601,6 +1602,7 @@ See also info node `(magit)Section Movement'."
(magit--maybe-update-revision-buffer)))
(add-hook 'magit-section-movement-hook #'magit-log-maybe-update-revision-buffer)
(add-hook 'magit-mouse-set-point-hook #'magit-log-maybe-update-revision-buffer)
(defun magit--maybe-update-revision-buffer ()
(when-let* ((commit (magit-section-value-if 'commit))
@@ -1916,13 +1918,8 @@ Type \\[magit-cherry-pick] to apply the commit at point.
(defun magit-insert-cherry-headers ()
"Insert headers appropriate for `magit-cherry-mode' buffers."
(let ((branch (propertize magit-buffer-refname
'font-lock-face 'magit-branch-local))
(upstream (propertize
magit-buffer-cherry-upstream 'font-lock-face
(if (magit-local-branch-p magit-buffer-cherry-upstream)
'magit-branch-local
'magit-branch-remote))))
(let ((branch (magit-branch-set-face magit-buffer-refname))
(upstream (magit-branch-set-face magit-buffer-cherry-upstream)))
(magit-insert-head-branch-header branch)
(magit-insert-upstream-branch-header branch upstream "Upstream: ")
(insert ?\n)))
@@ -2121,11 +2118,15 @@ all others with \"-\"."
;; Local Variables:
;; read-symbol-shorthands: (
;; ("and$" . "cond-let--and$")
;; ("and>" . "cond-let--and>")
;; ("and-let" . "cond-let--and-let")
;; ("if-let" . "cond-let--if-let")
;; ("thread$" . "cond-let--thread$")
;; ("when$" . "cond-let--when$")
;; ("and-let*" . "cond-let--and-let*")
;; ("and-let" . "cond-let--and-let")
;; ("if-let*" . "cond-let--if-let*")
;; ("if-let" . "cond-let--if-let")
;; ("when-let*" . "cond-let--when-let*")
;; ("when-let" . "cond-let--when-let")
;; ("while-let*" . "cond-let--while-let*")
;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
;; ("match-str" . "match-string-no-properties"))