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

100
lisp/magit-section/magit-section.el
View File

@@ -8,11 +8,11 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: tools
;; Package-Version: 4.3.0
;; Package-Version: 4.3.1
;; Package-Requires: (
;; (emacs "27.1")
;; (compat "30.0.2.0")
;; (llama "0.6.0")
;; (llama "0.6.1")
;; (seq "2.24"))
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -396,8 +396,7 @@ no effect. This also has no effect for Emacs >= 28, where
(defvar-keymap magit-section-heading-map
:doc "Keymap used in the heading line of all expandable sections.
This keymap is used in addition to the section-specific keymap,
if any."
This keymap is used in addition to the section-specific keymap, if any."
"<double-down-mouse-1>" #'ignore
"<double-mouse-1>" #'magit-mouse-toggle-section
"<double-mouse-2>" #'magit-mouse-toggle-section)
@@ -1392,7 +1391,7 @@ anything this time around.
(pcase-let* ((bind (and (symbolp (car args))
(pop args)))
(`((,class ,value ,hide . ,args) . ,body) args)
(obj (cl-gensym "section")))
(obj (gensym "section")))
`(let* ((,obj (magit-insert-section--create
,(if (eq (car-safe class) 'eval) (cadr class) `',class)
,value ,hide ,@args))
@@ -1448,47 +1447,33 @@ anything this time around.
(defun magit-insert-section--finish (obj)
(run-hooks 'magit-insert-section-hook)
(let ((beg (oref obj start))
(end (oset obj end
(if magit-section-inhibit-markers
(point)
(point-marker))))
(props `( magit-section ,obj
,@(and-let* ((map (symbol-value (oref obj keymap))))
(list 'keymap map)))))
(unless magit-section-inhibit-markers
(set-marker-insertion-type beg t))
(cond ((eq obj magit-root-section))
((oref obj children)
(magit-insert-child-count obj)
(magit-section-maybe-add-heading-map obj)
(save-excursion
(goto-char beg)
(while (< (point) end)
(let ((next (or (next-single-property-change
(point) 'magit-section)
end)))
(unless (magit-section-at)
(add-text-properties (point) next props))
(goto-char next)))))
((add-text-properties beg end props)))
(cond ((eq obj magit-root-section)
(when (eq magit-section-inhibit-markers 'delay)
(setq magit-section-inhibit-markers nil)
(magit-map-sections
(lambda (section)
(oset section start (copy-marker (oref section start) t))
(oset section end (copy-marker (oref section end) t)))))
(let ((magit-section-cache-visibility nil))
(magit-section-show obj)))
(magit-section-insert-in-reverse
(push obj (oref (oref obj parent) children)))
((let ((parent (oref obj parent)))
(oset parent children
(nconc (oref parent children)
(list obj))))))
(when magit-section-insert-in-reverse
(oset obj children (nreverse (oref obj children))))))
(if magit-section-inhibit-markers
(oset obj end (point))
(oset obj end (point-marker))
(set-marker-insertion-type (oref obj start) t))
(cond
((eq obj magit-root-section)
(when (eq magit-section-inhibit-markers 'delay)
(setq magit-section-inhibit-markers nil)
(magit-map-sections
(lambda (section)
(oset section start (copy-marker (oref section start) t))
(oset section end (copy-marker (oref section end) t)))))
(let ((magit-section-cache-visibility nil))
(magit-section-show obj)))
(t
(magit-section--set-section-properties obj)
(magit-section-maybe-add-heading-map obj)
(when (oref obj children)
(magit-insert-child-count obj))
(if magit-section-insert-in-reverse
(push obj (oref (oref obj parent) children))
(let ((parent (oref obj parent)))
(oset parent children
(nconc (oref parent children)
(list obj)))))))
(when magit-section-insert-in-reverse
(oset obj children (nreverse (oref obj children)))))
(defun magit-cancel-section (&optional if-empty)
"Cancel inserting the section that is currently being inserted.
@@ -1574,9 +1559,9 @@ If the section is expanded when it is created, then this is
like `progn'. Otherwise BODY isn't evaluated until the section
is explicitly expanded."
(declare (indent 0))
(let ((f (cl-gensym))
(s (cl-gensym))
(l (cl-gensym)))
(let ((f (gensym))
(s (gensym))
(l (gensym)))
`(let ((,f (lambda () ,@body)))
(if (oref magit-insert-section--current hidden)
(oset magit-insert-section--current washer
@@ -1588,6 +1573,7 @@ is explicitly expanded."
(funcall ,f)
(dolist (s ,l)
(set-marker-insertion-type (oref s end) nil))
(magit-section--set-section-properties ,s)
(magit-section-maybe-remove-heading-map ,s)
(magit-section-maybe-remove-visibility-indicator ,s)))))
(funcall ,f)))))
@@ -1615,6 +1601,22 @@ is explicitly expanded."
(magit-section-maybe-add-heading-map 1st-header)))))
(remove-hook 'magit-insert-section-hook fn t))))
(defun magit-section--set-section-properties (section)
(pcase-let* (((eieio start end children keymap) section)
(props `( magit-section ,section
,@(and-let* ((map (symbol-value keymap)))
(list 'keymap map)))))
(if children
(save-excursion
(goto-char start)
(while (< (point) end)
(let ((next (or (next-single-property-change (point) 'magit-section)
end)))
(unless (magit-section-at)
(add-text-properties (point) next props))
(goto-char next))))
(add-text-properties start end props))))
(defun magit-section-maybe-add-heading-map (section)
(when (magit-section-content-p section)
(let ((start (oref section start))