From 98d0b528369b5d1a81ab766eb2a69a707cce9d96 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 29 Jun 2024 13:40:44 -0400 Subject: [PATCH 1/4] refactor(org): remove unneeded advice These were all upstreamed into org-mode at some point. --- modules/lang/org/config.el | 55 +------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index a17228d85..48ca5ee47 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -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) From 5d1e580696080403326aeb81007126cb45adf4e8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 29 Jun 2024 13:45:15 -0400 Subject: [PATCH 2/4] bump: :app emacs-circe/circe@d374042741cf -> emacs-circe/circe@9d703f481a2c https://git.savannah.gnu.org/git/emms.git@87d0d1fb0566 -> https://git.savannah.gnu.org/git/emms.git@cead7b435a67 kidd/org-gcal.el@a2d16b372e5a -> kidd/org-gcal.el@9f9d93e4f0d5 skeeto/elfeed@55fb162fa27e -> skeeto/elfeed@5c05a1eab37b tecosaur/emacs-everywhere@bc91164151ab -> tecosaur/emacs-everywhere@0b731ca6da35 --- modules/app/calendar/packages.el | 2 +- modules/app/emms/packages.el | 2 +- modules/app/everywhere/packages.el | 2 +- modules/app/irc/packages.el | 2 +- modules/app/rss/packages.el | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/app/calendar/packages.el b/modules/app/calendar/packages.el index d9054fed6..778fe59cd 100644 --- a/modules/app/calendar/packages.el +++ b/modules/app/calendar/packages.el @@ -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") diff --git a/modules/app/emms/packages.el b/modules/app/emms/packages.el index 60ec5f81c..882f8d178 100644 --- a/modules/app/emms/packages.el +++ b/modules/app/emms/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; app/emms/packages.el -(package! emms :pin "87d0d1fb0566a80229029d0d8d7c863138d70aae") +(package! emms :pin "cead7b435a679690fd4bbe91fa2f57739a1e0077") diff --git a/modules/app/everywhere/packages.el b/modules/app/everywhere/packages.el index 7d9518f5f..281ee480e 100644 --- a/modules/app/everywhere/packages.el +++ b/modules/app/everywhere/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; app/everywhere/packages.el -(package! emacs-everywhere :pin "bc91164151ab012ff884af92321557f9b37eeed1") +(package! emacs-everywhere :pin "0b731ca6da351ba40953d090acf69e81757d437b") diff --git a/modules/app/irc/packages.el b/modules/app/irc/packages.el index 299a83fba..a0173c34c 100644 --- a/modules/app/irc/packages.el +++ b/modules/app/irc/packages.el @@ -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") diff --git a/modules/app/rss/packages.el b/modules/app/rss/packages.el index 3e5c373dc..dff960afb 100644 --- a/modules/app/rss/packages.el +++ b/modules/app/rss/packages.el @@ -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")) From 95b7fb1b75fd28855852e36a6a4b8f1dccd1a200 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 29 Jun 2024 13:48:24 -0400 Subject: [PATCH 3/4] bump: :os tty :input chinese emacs-straight/xclip@2dfa5fa17544 -> emacs-straight/xclip@e132bbff5529 merrickluo/liberime@cc9eb9812fd6 -> merrickluo/liberime@c5839f541763 tumashu/posframe@017deece8836 -> tumashu/posframe@f4e9e509ba96 tumashu/pyim@64067b20ce0e -> tumashu/pyim@f22c20f2e6af --- modules/input/chinese/packages.el | 6 +++--- modules/os/tty/packages.el | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/input/chinese/packages.el b/modules/input/chinese/packages.el index 880d648d5..0e9368a5d 100644 --- a/modules/input/chinese/packages.el +++ b/modules/input/chinese/packages.el @@ -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)) diff --git a/modules/os/tty/packages.el b/modules/os/tty/packages.el index 26b559c0b..0156d38f2 100644 --- a/modules/os/tty/packages.el +++ b/modules/os/tty/packages.el @@ -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). From a0dadda2666886840e63f28d96a03a6f635a4fe6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 29 Jun 2024 15:32:19 -0400 Subject: [PATCH 4/4] bump: :term LemonBreezes/emacs-fish-completion@006c613ff7f8 -> LemonBreezes/emacs-fish-completion@1256f137a203 akermu/emacs-libvterm@94e2b0b2b4a7 -> akermu/emacs-libvterm@df057b1af2bb akreisher/eshell-syntax-highlighting@1d25386bf7d1 -> akreisher/eshell-syntax-highlighting@b960d036c22f --- modules/term/eshell/packages.el | 4 ++-- modules/term/vterm/packages.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/term/eshell/packages.el b/modules/term/eshell/packages.el index 2c4adcd8e..239fd4017 100644 --- a/modules/term/eshell/packages.el +++ b/modules/term/eshell/packages.el @@ -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")) diff --git a/modules/term/vterm/packages.el b/modules/term/vterm/packages.el index 74efc3bcd..da845fad8 100644 --- a/modules/term/vterm/packages.el +++ b/modules/term/vterm/packages.el @@ -3,4 +3,4 @@ (package! vterm :built-in 'prefer - :pin "94e2b0b2b4a750e7907dacd5b4c0584900846dd1") + :pin "df057b1af2bb89a1deb288086f13be296af42090")