From 8d4d831565ca492572796612c7f23e588a37c7cf Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2024 01:53:22 -0500 Subject: [PATCH 1/5] dev: update license year Hey! The world didn't end. How about that? This year though... Ref: 2df6a2e28abd --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index fde4817c3..a367cd897 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2022 Henrik Lissner. +Copyright (c) 2014-2024 Henrik Lissner. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the From 1e8fd0912009988ad101d3ead47c23b8e091699f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2024 02:09:45 -0500 Subject: [PATCH 2/5] fix(format): +format-in-org-src-blocks-fn Didn't return non-nil, so whether or not it worked, Apheleia would attempt to (ineffectually) format the org buffer afterwards. Also remove unneeded beg/end checks (the functions always receive a value). --- modules/editor/format/autoload/format.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el index ab49403bd..5dc51fd9d 100644 --- a/modules/editor/format/autoload/format.el +++ b/modules/editor/format/autoload/format.el @@ -138,8 +138,8 @@ the requested feature." (goto-char (org-element-property :end element)) (skip-chars-backward " \t\n") (line-beginning-position))) - (beg (if beg (max beg block-beg) block-beg)) - (end (if end (min end block-end) block-end)) + (beg (max beg block-beg)) + (end (min end block-end)) (lang (org-element-property :language element)) (major-mode (org-src-get-lang-mode lang))) (save-excursion @@ -152,4 +152,5 @@ the requested feature." (unless formatter (user-error "No formatter configured for language: %s" lang))) (let ((apheleia-formatter formatter)) - (+format-region beg end))))))))) + (+format-region beg end))))))) + t)) From 5c7149da670fa76f4422dee2e8b432a2af9189bc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2024 02:10:26 -0500 Subject: [PATCH 3/5] docs(format): +format-in-org-src-blocks-fn: add docstring --- modules/editor/format/autoload/format.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el index 5dc51fd9d..709855817 100644 --- a/modules/editor/format/autoload/format.el +++ b/modules/editor/format/autoload/format.el @@ -126,7 +126,7 @@ the requested feature." ;;;###autoload (defun +format-in-org-src-blocks-fn (beg end _op) - "TODO" + "Reformat org src blocks with apheleia as if they were independent buffers." (when (derived-mode-p 'org-mode) (goto-char beg) (while (re-search-forward org-babel-src-block-regexp end t) From cce9438d9f7f28bb5ca3e05cf7c1202dff586956 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2024 15:20:57 -0500 Subject: [PATCH 4/5] fix(default): +evil module flag typo --- modules/config/default/autoload/default.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el index a1f645b81..b63a0d749 100644 --- a/modules/config/default/autoload/default.el +++ b/modules/config/default/autoload/default.el @@ -33,7 +33,7 @@ generate `completing-read' candidates." (defun +default/new-buffer () "TODO" (interactive) - (if (modulep! 'evil) + (if (modulep! +evil) (call-interactively #'evil-buffer-new) (let ((buffer (generate-new-buffer "*new*"))) (set-window-buffer nil buffer) From f0ad161643c05842ca41bcb5daadcf7a7db98983 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 17 Feb 2024 07:11:48 -0500 Subject: [PATCH 5/5] fix(org): list checkbox toggle on RET A subtle change in the way org-toggle-checkbox handles its prefix argument changed how RET (+org/dwim-at-point) handled list checkboxes (incorrectlying swapping [ ] with [-], but not back, unless the cursor was directly on top of the checkbox). --- modules/lang/org/autoload/org.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el index 7b318e5c2..f1c033344 100644 --- a/modules/lang/org/autoload/org.el +++ b/modules/lang/org/autoload/org.el @@ -272,13 +272,12 @@ If on a: (org-element-property :end lineage)) (org-open-at-point arg)))) + ((guard (org-element-property :checkbox (org-element-lineage context '(item) t))) + (org-toggle-checkbox)) + (`paragraph (+org--toggle-inline-images-in-subtree)) - ((guard (org-element-property :checkbox (org-element-lineage context '(item) t))) - (let ((match (and (org-at-item-checkbox-p) (match-string 1)))) - (org-toggle-checkbox (if (equal match "[ ]") '(16))))) - (_ (if (or (org-in-regexp org-ts-regexp-both nil t) (org-in-regexp org-tsr-regexp-both nil t)