From 52355c6131fdddea578bf3de737a46c60852a127 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 9 Feb 2024 00:25:05 -0500 Subject: [PATCH 1/5] fix(org): initialize eldoc in org-mode buffers A recent change upstream (see emacsmirror/org-contrib@6e208c87bf6e) removed the autoload for adding org-eldoc-load to org-mode-hook, so we have to add the hook ourselves (the function is still autoloaded, fortunately). Also moves org-eldoc config into its own use-package! block. Fix: #7633 Ref: emacsmirror/org-contrib@6e208c87bf6e --- modules/lang/org/config.el | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index c0606dec4..087f95cf6 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -105,7 +105,6 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default (defun +org-init-appearance-h () "Configures the UI for `org-mode'." (setq org-indirect-buffer-display 'current-window - org-eldoc-breadcrumb-separator " → " org-enforce-todo-dependencies t org-entities-user '(("flat" "\\flat" nil "" "" "266D" "♭") @@ -814,14 +813,6 @@ Unlike showNlevels, this will also unfold parent trees." :weight bold)))) (apply fn args))) - (after! org-eldoc - ;; HACK Fix #2972: infinite recursion when eldoc kicks in in 'org' or - ;; 'python' src blocks. - ;; TODO Should be reported upstream! - (puthash "org" #'ignore org-eldoc-local-functions-cache) - (puthash "plantuml" #'ignore org-eldoc-local-functions-cache) - (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache)) - (defun +org--restart-mode-h () "Restart `org-mode', but only once." (quiet! (org-mode-restart)) @@ -1194,6 +1185,20 @@ between the two." (add-hook 'kill-emacs-hook #'org-clock-save)) +(use-package! org-eldoc + ;; HACK: Fix #7633: this hook is no longer autoloaded by org-eldoc (in + ;; org-contrib), so we have to add it ourselves. + :hook (org-mode . org-eldoc-load) + :init (setq org-eldoc-breadcrumb-separator " → ") + :config + ;; HACK Fix #2972: infinite recursion when eldoc kicks in in 'org' or 'python' + ;; src blocks. + ;; TODO Should be reported upstream! + (puthash "org" #'ignore org-eldoc-local-functions-cache) + (puthash "plantuml" #'ignore org-eldoc-local-functions-cache) + (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache)) + + (use-package! org-pdftools :when (modulep! :tools pdf) :commands org-pdftools-export From 3986ee6c2b1b2629a12733017d675c9ac94a84ba Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Feb 2024 12:36:20 -0500 Subject: [PATCH 2/5] fix: exclude indent detection in derived modes Changes what major modes we exclude from dtrt-indent's auto-detection. Any mode in doom-detect-indentation-excluded-modes, plus derived modes, will be excluded instead of only the parent modes. This indirectly fixes an issue where org-mode derivatives (like org-journal-mode) have their tab-width changed (#7670), causing the `org-current-text-column` macro to throw the following error: Tab width in Org files must be 8, not N. Please adjust your `tab-width' settings for Org mode. I opted for this solution instead rather than adding all possibly derivatives to `doom-detect-indentation-excluded-modes`. Fix: #7670 Ref: https://github.com/emacs-straight/org-mode/blob/38dd882685e3cc5843a9cf30155432b4ebce8514/lisp/org-macs.el#L1154 --- lisp/doom-editor.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el index 2159b885c..2827fde85 100644 --- a/lisp/doom-editor.el +++ b/lisp/doom-editor.el @@ -2,10 +2,8 @@ ;;; Commentary: ;;; Code: -(defvar doom-detect-indentation-excluded-modes - '(fundamental-mode pascal-mode so-long-mode doom-docs-org-mode) - "A list of major modes in which indentation should be automatically -detected.") +(defvar doom-detect-indentation-excluded-modes '(pascal-mode so-long-mode) + "A list of major modes where indentation shouldn't be auto-detected.") (defvar-local doom-inhibit-indent-detection nil "A buffer-local flag that indicates whether `dtrt-indent' should try to detect @@ -502,8 +500,9 @@ files, so this replace calls to `pp' with the much faster `prin1'." (unless (or (not after-init-time) doom-inhibit-indent-detection doom-large-file-p - (memq major-mode doom-detect-indentation-excluded-modes) - (member (substring (buffer-name) 0 1) '(" " "*"))) + (eq major-mode 'fundamental-mode) + (member (substring (buffer-name) 0 1) '(" " "*")) + (apply #'derived-mode-p doom-detect-indentation-excluded-modes)) ;; Don't display messages in the echo area, but still log them (let ((inhibit-message (not init-file-debug))) (dtrt-indent-mode +1)))) From fe776f8d84027759482c59bcb360b8eaef756864 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Feb 2024 20:41:37 -0500 Subject: [PATCH 3/5] fix(vertico): use remote fd in tramp buffers --- modules/completion/vertico/config.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index f92bd85a2..59c8d284d 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -145,15 +145,14 @@ orderless." consult-async-min-input 2 consult-async-refresh-delay 0.15 consult-async-input-throttle 0.2 - consult-async-input-debounce 0.1) - (if doom-projectile-fd-binary - (setq consult-fd-args - '(doom-projectile-fd-binary - "--color=never" - ;; https://github.com/sharkdp/fd/issues/839 - "--full-path --absolute-path" - "--hidden --exclude .git" - (if (featurep :system 'windows) "--path-separator=/")))) + consult-async-input-debounce 0.1 + consult-fd-args + '((if (executable-find "fdfind" 'remote) "fdfind" "fd") + "--color=never" + ;; https://github.com/sharkdp/fd/issues/839 + "--full-path --absolute-path" + "--hidden --exclude .git" + (if (featurep :system 'windows) "--path-separator=/"))) (consult-customize consult-ripgrep consult-git-grep consult-grep From 771051886912f934cdbc21a22abdc7c173c9f170 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 14 Feb 2024 08:52:58 +0100 Subject: [PATCH 4/5] bump: :email wanderlust wanderlust/wanderlust@9fd2c65e8d69 -> wanderlust/wanderlust@c15e8ece4f34 --- modules/email/wanderlust/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el index 48203a6bd..d6ec56a78 100644 --- a/modules/email/wanderlust/packages.el +++ b/modules/email/wanderlust/packages.el @@ -8,7 +8,7 @@ (package! flim :recipe (:branch "flim-1_14-wl") :pin "abdd2315006eb31476249223569808adb1c0f7b2") (package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256") -(package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04") +(package! wanderlust :pin "c15e8ece4f34f10479e17cda19d10b98f6be3ec1") (when (modulep! +xface) (package! x-face-e21 From 8651651125f8009b669f0297c63683968a8f014e Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 14 Feb 2024 08:55:24 +0100 Subject: [PATCH 5/5] tweak(wanderlust): don't show DomainKey-Signature --- modules/email/wanderlust/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 3175268c3..db4a5b696 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -50,6 +50,7 @@ "^List-.*:" "^Received-SPF:" "^DKIM-.*:" + "^DomainKey-Signature:" "^SPF-.*:" "^Autocrypt:" "^ARC-.*:"