update packages
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
(define-package "magit-section" "20250221.105" "Sections for read-only buffers"
|
||||
(define-package "magit-section" "20250307.1739" "Sections for read-only buffers"
|
||||
'((emacs "27.1")
|
||||
(compat "30.0.2.0")
|
||||
(llama "0.6.0")
|
||||
(llama "0.6.1")
|
||||
(seq "2.24"))
|
||||
:commit "3ad94012b0f570809c52eb3323fa1436e180984e" :authors
|
||||
:commit "3f79700f1b9a6f5f6fd6a77fd1e812c1b8e6463b" :authors
|
||||
'(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
|
||||
:maintainers
|
||||
'(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
This is magit-section.info, produced by makeinfo version 6.8 from
|
||||
This is magit-section.info, produced by makeinfo version 7.1.1 from
|
||||
magit-section.texi.
|
||||
|
||||
Copyright (C) 2015-2025 Jonas Bernoulli
|
||||
@@ -34,7 +34,7 @@ packages that have nothing to do with Magit or Git.
|
||||
and user options see *note (magit)Sections::. This manual documents how
|
||||
you can use sections in your own packages.
|
||||
|
||||
This manual is for Magit-Section version 4.3.0.
|
||||
This manual is for Magit-Section version 4.3.1.
|
||||
|
||||
Copyright (C) 2015-2025 Jonas Bernoulli
|
||||
<emacs.magit@jonas.bernoulli.dev>
|
||||
@@ -85,17 +85,17 @@ File: magit-section.info, Node: Creating Sections, Next: Core Functions, Prev
|
||||
body
|
||||
Create a section object of type CLASS, storing VALUE in its ‘value’
|
||||
slot, and insert the section at point. CLASS is a subclass of
|
||||
‘magit-section’ or has the form ‘(eval FORM)’, in which case FORM
|
||||
'magit-section' or has the form ‘(eval FORM)’, in which case FORM
|
||||
is evaluated at runtime and should return a subclass. In other
|
||||
places a sections class is often referred to as its "type".
|
||||
|
||||
Many commands behave differently depending on the class of the
|
||||
current section and sections of a certain class can have their own
|
||||
keymap, which is specified using the ‘keymap’ class slot. The
|
||||
keymap, which is specified using the 'keymap' class slot. The
|
||||
value of that slot should be a variable whose value is a keymap.
|
||||
|
||||
For historic reasons Magit and Forge in most cases use symbols as
|
||||
CLASS that don’t actually identify a class and that lack the
|
||||
CLASS that don't actually identify a class and that lack the
|
||||
appropriate package prefix. This works due to some undocumented
|
||||
kludges, which are not available to other packages.
|
||||
|
||||
@@ -106,19 +106,19 @@ File: magit-section.info, Node: Creating Sections, Next: Core Functions, Prev
|
||||
during a refresh, then the visibility of predecessor is inherited
|
||||
and HIDE is ignored (but the hook is still honored).
|
||||
|
||||
BODY is any number of forms that actually insert the section’s
|
||||
BODY is any number of forms that actually insert the section's
|
||||
heading and body. Optional NAME, if specified, has to be a symbol,
|
||||
which is then bound to the object of the section being inserted.
|
||||
|
||||
Before BODY is evaluated the ‘start’ of the section object is set
|
||||
to the value of ‘point’ and after BODY was evaluated its ‘end’ is
|
||||
to the value of 'point' and after BODY was evaluated its ‘end’ is
|
||||
set to the new value of ‘point’; BODY is responsible for moving
|
||||
‘point’ forward.
|
||||
|
||||
If it turns out inside BODY that the section is empty, then
|
||||
‘magit-cancel-section’ can be used to abort and remove all traces
|
||||
of the partially inserted section. This can happen when creating a
|
||||
section by washing Git’s output and Git didn’t actually output
|
||||
section by washing Git's output and Git didn't actually output
|
||||
anything this time around.
|
||||
|
||||
-- Function: magit-insert-heading [child-count] &rest args
|
||||
@@ -136,7 +136,7 @@ File: magit-section.info, Node: Creating Sections, Next: Core Functions, Prev
|
||||
any text before this happens and afterwards it should again only
|
||||
contain a single line. If the ‘face’ property is set anywhere
|
||||
inside any of these strings, then insert all of them unchanged.
|
||||
Otherwise use the ‘magit-section-heading’ face for all inserted
|
||||
Otherwise use the 'magit-section-heading' face for all inserted
|
||||
text.
|
||||
|
||||
The ‘content’ property of the section object is the end of the
|
||||
@@ -145,7 +145,7 @@ File: magit-section.info, Node: Creating Sections, Next: Core Functions, Prev
|
||||
value of ‘content’ is nil, then the section has no heading and its
|
||||
body cannot be collapsed. If a section does have a heading, then
|
||||
its height must be exactly one line, including a trailing newline
|
||||
character. This isn’t enforced, you are responsible for getting it
|
||||
character. This isn't enforced, you are responsible for getting it
|
||||
right. The only exception is that this function does insert a
|
||||
newline character if necessary.
|
||||
|
||||
@@ -159,7 +159,7 @@ File: magit-section.info, Node: Creating Sections, Next: Core Functions, Prev
|
||||
-- Macro: magit-insert-section-body &rest body
|
||||
Use BODY to insert the section body, once the section is expanded.
|
||||
If the section is expanded when it is created, then this is like
|
||||
‘progn’. Otherwise BODY isn’t evaluated until the section is
|
||||
‘progn’. Otherwise BODY isn't evaluated until the section is
|
||||
explicitly expanded.
|
||||
|
||||
-- Function: magit-cancel-section
|
||||
@@ -254,13 +254,13 @@ File: magit-section.info, Node: Matching Functions, Prev: Core Functions, Up:
|
||||
CONDITION can take the following forms:
|
||||
|
||||
• ‘(CONDITION...)’ matches if any of the CONDITIONs matches.
|
||||
• ‘[CLASS...]’ matches if the section’s class is the same as the
|
||||
first CLASS or a subclass of that; the section’s parent class
|
||||
• ‘[CLASS...]’ matches if the section's class is the same as the
|
||||
first CLASS or a subclass of that; the section's parent class
|
||||
matches the second CLASS; and so on.
|
||||
|
||||
• ‘[* CLASS...]’ matches sections that match [CLASS...] and also
|
||||
recursively all their child sections.
|
||||
• ‘CLASS’ matches if the section’s class is the same as CLASS or
|
||||
• ‘CLASS’ matches if the section's class is the same as CLASS or
|
||||
a subclass of that; regardless of the classes of the parent
|
||||
sections.
|
||||
|
||||
@@ -303,11 +303,11 @@ File: magit-section.info, Node: Matching Functions, Prev: Core Functions, Up:
|
||||
|
||||
|
||||
Tag Table:
|
||||
Node: Top808
|
||||
Node: Introduction2109
|
||||
Node: Creating Sections2879
|
||||
Node: Core Functions7812
|
||||
Node: Matching Functions10964
|
||||
Node: Top810
|
||||
Node: Introduction2111
|
||||
Node: Creating Sections2881
|
||||
Node: Core Functions7786
|
||||
Node: Matching Functions10938
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
||||
Reference in New Issue
Block a user