dev: updating from latest

This commit is contained in:
Matt Nish-Lapidus 2024-02-17 09:03:02 -05:00
commit 8dd40db6b3
4 changed files with 10 additions and 10 deletions

View file

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

View file

@ -33,7 +33,7 @@ generate `completing-read' candidates."
(defun +default/new-buffer () (defun +default/new-buffer ()
"TODO" "TODO"
(interactive) (interactive)
(if (modulep! 'evil) (if (modulep! +evil)
(call-interactively #'evil-buffer-new) (call-interactively #'evil-buffer-new)
(let ((buffer (generate-new-buffer "*new*"))) (let ((buffer (generate-new-buffer "*new*")))
(set-window-buffer nil buffer) (set-window-buffer nil buffer)

View file

@ -126,7 +126,7 @@ the requested feature."
;;;###autoload ;;;###autoload
(defun +format-in-org-src-blocks-fn (beg end _op) (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) (when (derived-mode-p 'org-mode)
(goto-char beg) (goto-char beg)
(while (re-search-forward org-babel-src-block-regexp end t) (while (re-search-forward org-babel-src-block-regexp end t)
@ -138,8 +138,8 @@ the requested feature."
(goto-char (org-element-property :end element)) (goto-char (org-element-property :end element))
(skip-chars-backward " \t\n") (skip-chars-backward " \t\n")
(line-beginning-position))) (line-beginning-position)))
(beg (if beg (max beg block-beg) block-beg)) (beg (max beg block-beg))
(end (if end (min end block-end) block-end)) (end (min end block-end))
(lang (org-element-property :language element)) (lang (org-element-property :language element))
(major-mode (org-src-get-lang-mode lang))) (major-mode (org-src-get-lang-mode lang)))
(save-excursion (save-excursion
@ -152,4 +152,5 @@ the requested feature."
(unless formatter (unless formatter
(user-error "No formatter configured for language: %s" lang))) (user-error "No formatter configured for language: %s" lang)))
(let ((apheleia-formatter formatter)) (let ((apheleia-formatter formatter))
(+format-region beg end))))))))) (+format-region beg end)))))))
t))

View file

@ -272,13 +272,12 @@ If on a:
(org-element-property :end lineage)) (org-element-property :end lineage))
(org-open-at-point arg)))) (org-open-at-point arg))))
((guard (org-element-property :checkbox (org-element-lineage context '(item) t)))
(org-toggle-checkbox))
(`paragraph (`paragraph
(+org--toggle-inline-images-in-subtree)) (+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) (if (or (org-in-regexp org-ts-regexp-both nil t)
(org-in-regexp org-tsr-regexp-both nil t) (org-in-regexp org-tsr-regexp-both nil t)