diff options
| author | Amy Grinn <grinn.amy@gmail.com> | 2025-01-04 09:15:59 -0500 |
|---|---|---|
| committer | Amy Grinn <grinn.amy@gmail.com> | 2025-01-04 09:15:59 -0500 |
| commit | 97576905767a02442fcb0ed1d863fd6a3a8c7711 (patch) | |
| tree | f17b3a853b45ad4d3320a55564e67acc77bddd93 | |
| parent | 7a8f3bc329f192e5825d8340fcbefea7b0bdf74b (diff) | |
Updating boxy to 2.0.0
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | boxy-headings.el | 30 |
2 files changed, 17 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f50f7a..d4315fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,15 +4,14 @@ stages: package: stage: build - image: silex/emacs:27 + image: silex/emacs:29 variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh - export PATH=$PATH:/root/.local/bin script: - - eldev lint doc - - eldev lint re + - eldev lint doc re # TODO package-lint erroneously says emacs 26 doesn't support org-collect-keywords # - eldev lint package - eldev compile -W diff --git a/boxy-headings.el b/boxy-headings.el index 738175f..1070cda 100644 --- a/boxy-headings.el +++ b/boxy-headings.el @@ -3,9 +3,9 @@ ;; Copyright (C) 2021-2024 Free Software Foundation, Inc. ;; Author: Amy Grinn <grinn.amy@gmail.com> -;; Version: 2.1.6 +;; Version: 2.1.7 ;; File: boxy-headings.el -;; Package-Requires: ((emacs "26.1") (boxy "1.1") (org "9.4")) +;; Package-Requires: ((emacs "26.1") (boxy "2.0") (org "9.4")) ;; Keywords: tools ;; URL: https://gitlab.com/grinn.amy/boxy-headings @@ -286,18 +286,18 @@ diagram." (t 0)) :primary t))) (boxy-add-next box parent) - (if children - (object-add-to-list box :expand-children - `(lambda (box) - (mapc - (lambda (h) (boxy-headings--add-heading h box)) - ',children)))) - (if siblings - (object-add-to-list box :expand-siblings - `(lambda (box) - (mapc - (lambda (h) (boxy-headings--add-heading h box)) - ',siblings)))))))) + (when children + (push `(lambda (box) + (mapc + (lambda (h) (boxy-headings--add-heading h box)) + ',children)) + (boxy-box-expand-children box))) + (when siblings + (push `(lambda (box) + (mapc + (lambda (h) (boxy-headings--add-heading h box)) + ',siblings)) + (boxy-box-expand-siblings box))))))) ;;;; Utility expressions @@ -322,7 +322,7 @@ diagram." POS can be nil to use the heading at point. -The default relationship is 'in'." +The default relationship is \"in\"." (let ((heading-rel (org-entry-get pos "REL"))) (if (not heading-rel) "in" |