dev: merge branch 'master' into emenel

This commit is contained in:
Matt Nish-Lapidus 2024-06-30 13:28:33 -04:00
commit 31566b8988
10 changed files with 13 additions and 66 deletions

View file

@ -5,4 +5,4 @@
(package! calfw-org :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
(package! calfw-cal :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
(package! calfw-ical :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
(package! org-gcal :pin "a2d16b372e5a5972d8cc343cf999ee5f0ba1eea7")
(package! org-gcal :pin "9f9d93e4f0d5863b1318e9e702e1ee6e841c2649")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; app/emms/packages.el
(package! emms :pin "87d0d1fb0566a80229029d0d8d7c863138d70aae")
(package! emms :pin "cead7b435a679690fd4bbe91fa2f57739a1e0077")

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; app/everywhere/packages.el
(package! emacs-everywhere :pin "bc91164151ab012ff884af92321557f9b37eeed1")
(package! emacs-everywhere :pin "0b731ca6da351ba40953d090acf69e81757d437b")

View file

@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*-
;;; app/irc/packages.el
(package! circe :pin "d374042741cfd0691135f215d311dca8b7a47d19")
(package! circe :pin "9d703f481a2c65f2b17edcc2b05412f9865d24af")
(package! circe-notifications :pin "291149ac12877bbd062da993479d3533a26862b0")

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; app/rss/packages.el
(package! elfeed :pin "55fb162fa27e71b88effa59a83c57842e262b00f")
(package! elfeed :pin "5c05a1eab37bc113ecb158a4d57fe05352fa2c6a")
(package! elfeed-goodies :pin "544ef42ead011d960a0ad1c1d34df5d222461a6b")
(when (modulep! +org)
(package! elfeed-org :pin "d62d23e25c5e3be3d70b7fbe1eaeb6e43f93a061"))

View file

@ -1,14 +1,14 @@
;; -*- no-byte-compile: t; -*-
;;; input/chinese/packages.el
(package! pyim :pin "64067b20ce0e964b1342b378180f24a1d4503797")
(package! pyim :pin "f22c20f2e6af55b3a758defabe4c842fb94cde2b")
(package! fcitx :pin "b399482ed8db5893db2701df01db4c38cccda495")
(package! ace-pinyin :pin "47662c0b05775ba353464b44c0f1a037c85e746e")
(package! pangu-spacing :pin "2303013e5cd7852136f1429162fea0e1c8cb0221")
(when (modulep! +rime)
(package! liberime :pin "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753"))
(package! liberime :pin "c5839f541763f661a4d46784f3f14adad28ee2b0"))
(when (modulep! +childframe)
(package! posframe :pin "017deece88360c7297265680d78a0bb316470716"))
(package! posframe :pin "f4e9e509ba96ceb3c2b2b054957291607fb52651"))
(when (modulep! :editor evil +everywhere)
(package! evil-pinyin
:recipe (:build (:not autoloads))

View file

@ -747,48 +747,6 @@ mutating hooks on exported output, like formatters."
;; Open help:* links with helpful-* instead of describe-*
(advice-add #'org-link--open-help :around #'doom-use-helpful-a)
;; Unlike the stock showNlevels options, these will also show the parents of
;; the target level, recursively.
(pushnew! org-startup-options
'("show2levels*" org-startup-folded show2levels*)
'("show3levels*" org-startup-folded show3levels*)
'("show4levels*" org-startup-folded show4levels*)
'("show5levels*" org-startup-folded show5levels*))
;; TODO Upstream this.
(defadvice! +org--recursive-org-persist-mkdir-a (fn &rest args)
"`org-persist-write:index' does not recursively create
`org-persist-directory', which causes an error if it's a parent doesn't exist."
:before #'org-persist-write:index
(make-directory org-persist-directory t))
(defadvice! +org--more-startup-folded-options-a ()
"Adds support for 'showNlevels*' startup options.
Unlike showNlevels, this will also unfold parent trees."
:before-until #'org-cycle-set-startup-visibility
(when-let (n (pcase org-startup-folded
(`show2levels* 2)
(`show3levels* 3)
(`show4levels* 4)
(`show5levels* 5)))
(org-fold-show-all '(headings))
(save-excursion
(goto-char (point-max))
(save-restriction
(narrow-to-region (point-min) (or (re-search-forward org-outline-regexp-bol nil t) (point-max)))
(org-fold-hide-drawer-all))
(goto-char (point-max))
(let ((regexp (if (and (wholenump n) (> n 0))
(format "^\\*\\{%d,%d\\} " (1- n) n)
"^\\*+ "))
(last (point)))
(while (re-search-backward regexp nil t)
(when (or (not (wholenump n))
(= (org-current-level) n))
(org-fold-core-region (line-end-position) last t 'outline))
(setq last (line-end-position 0)))))
t))
;; Some uses of `org-fix-tags-on-the-fly' occur without a check on
;; `org-auto-align-tags', such as in `org-self-insert-command' and
;; `org-delete-backward-char'.
@ -870,19 +828,8 @@ buffer as done, e.g., by `org-capture'."
find-file-hook)
(funcall fn file)))
;; HACK With https://code.orgmode.org/bzg/org-mode/commit/48da60f4, inline
;; image previews broke for users with imagemagick support built in. This
;; reverses the problem, but should be removed once it is addressed
;; upstream (if ever).
(defadvice! +org--fix-inline-images-for-imagemagick-users-a (fn &rest args)
:around #'org-display-inline-images
(letf! (defun create-image (file-or-data &optional type data-p &rest props)
(let ((type (if (plist-get props :width) type)))
(apply create-image file-or-data type data-p props)))
(apply fn args)))
(defadvice! +org--fix-inconsistent-uuidgen-case-a (uuid)
"Ensure uuidgen always produces lowercase output regardless of system."
"Ensure uuidgen is always lowercase (consistent) regardless of system."
:filter-return #'org-id-new
(if (eq org-id-method 'uuid)
(downcase uuid)

View file

@ -6,7 +6,7 @@
:recipe (:host github :repo "spudlyo/clipetty")
:pin "01b39044b9b65fa4ea7d3166f8b1ffab6f740362")
;; Despite its name, this works for macOS as well.
(package! xclip :pin "2dfa5fa1754470253fc106b8bd55d9b2bd6702fe"))
(package! xclip :pin "e132bbff5529c674a02929ebffd1fe4790d284b9"))
;; NOTE Despite the evil-* prefix, evil-terminal-cursor-changer does not depend
;; on evil (anymore).

View file

@ -6,8 +6,8 @@
(package! shrink-path :pin "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
(package! esh-help :pin "417673ed18a983930a66a6692dbfb288a995cb80")
(package! eshell-did-you-mean :pin "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d")
(package! eshell-syntax-highlighting :pin "1d25386bf7d1a97e083d33750a98fbd1c6598138")
(package! eshell-syntax-highlighting :pin "b960d036c22f818ccb9c381a2e9cdd89b29b659c")
(unless (featurep :system 'windows)
(package! fish-completion :pin "006c613ff7f846b7d0a14422f2bdcc28b21205b8")
(package! fish-completion :pin "1256f137a2039805d4e87f8e6c11a162ed019587")
(package! bash-completion :pin "f1daac0386c24cbe8a244a62c7588cc6847b07ae"))

View file

@ -3,4 +3,4 @@
(package! vterm
:built-in 'prefer
:pin "94e2b0b2b4a750e7907dacd5b4c0584900846dd1")
:pin "df057b1af2bb89a1deb288086f13be296af42090")