dev: merge branch 'pr7002' into emenel

modules/tools/biblio/config.el

@@ -29,12 +29,6 @@
         org-cite-activate-processor 'citar)
 
   :config
-  (after! embark
-    (citar-embark-mode))
-
-  (after! org-roam
-    (citar-org-roam-mode))
-
   (when (modulep! :completion vertico +icons)
     (defvar citar-indicator-files-icons
       (citar-indicator-create
@@ -81,6 +75,20 @@
 ;;
 ;;; Third-party
 
+(use-package! citar-embark
+  :defer t
+  :init
+  (after! (citar embark)
+    (citar-embark-mode)))
+
+
+(use-package! citar-org-roam
+  :defer t
+  :init
+  (after! (citar org-roam)
+    (citar-org-roam-mode)))
+
+
 (use-package! bibtex-completion
   :when (or (modulep! :completion ivy)
             (modulep! :completion helm))

modules/tools/editorconfig/config.el

@@ -1,21 +1,5 @@
 ;;; tools/editorconfig/config.el -*- lexical-binding: t; -*-
 
-;; editorconfig cannot procure the correct settings for extension-less files.
-;; Executable scripts with a shebang line, for example. So why not use Emacs'
-;; major mode to drop editorconfig a hint? This is accomplished by temporarily
-;; appending an extension to `buffer-file-name' when we talk to editorconfig.
-(defvar +editorconfig-mode-alist
-  '((emacs-lisp-mode . "el")
-    (js2-mode        . "js")
-    (perl-mode       . "pl")
-    (php-mode        . "php")
-    (python-mode     . "py")
-    (ruby-mode       . "rb")
-    (sh-mode         . "sh"))
-  "An alist mapping major modes to extensions. Used by
-`doom--editorconfig-smart-detection-a' to give editorconfig filetype hints.")
-
-
 ;; Handles whitespace (tabs/spaces) settings externally. This way projects can
 ;; specify their own formatting rules.
 (use-package! editorconfig
@@ -30,24 +14,20 @@
   (add-to-list 'editorconfig-exclude-regexps
                "\\.\\(zip\\|\\(doc\\|xls\\|ppt\\)x\\)\\'")
 
-  (defadvice! +editorconfig--smart-detection-a (fn)
-    "Retrieve the properties for the current file. If it doesn't have an
-extension, try to guess one."
-    :around #'editorconfig-call-editorconfig-exec
-    (let ((buffer-file-name
-           (if (and (not (bound-and-true-p org-src-mode))
-                    (file-name-extension buffer-file-name))
-               buffer-file-name
-             (format "%s%s" (buffer-file-name (buffer-base-buffer))
-                     (if-let (ext (alist-get major-mode +editorconfig-mode-alist))
-                         (concat "." ext)
-                       "")))))
-      (funcall fn)))
-
   (add-hook! 'editorconfig-after-apply-functions
     (defun +editorconfig-disable-indent-detection-h (props)
       "Inhibit `dtrt-indent' if an explicit indent_style and indent_size is
 specified by editorconfig."
-      (when (or (gethash 'indent_style props)
-                (gethash 'indent_size props))
-        (setq doom-inhibit-indent-detection 'editorconfig)))))
+      (when (and (not doom-inhibit-indent-detection)
+                 (or (gethash 'indent_style props)
+                     (gethash 'indent_size props)))
+        (setq doom-inhibit-indent-detection 'editorconfig)))
+    ;; I use a hook over `editorconfig-exclude-modes' because the option
+    ;; inhibits all settings, and I only want to inhibit indent_size. Plus modes
+    ;; in that option won't apply to derived modes, so we'd have to add *all*
+    ;; possible org-mode derivatives to it.
+    (defun +editorconfig-unset-tab-width-in-org-mode-h (props)
+      "A tab-width != 8 is an error state in org-mode, so prevent changing it."
+      (when (and (gethash 'indent_size props)
+                 (derived-mode-p 'org-mode))
+        (setq tab-width 8)))))

modules/tools/editorconfig/packages.el

@@ -3,4 +3,4 @@
 
 (package! editorconfig
   :recipe (:nonrecursive t)
-  :pin "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1")
+  :pin "c3666c093f3a2a80fb42e513bf0a10d597497c18")