dev: merge branch 'pr7339' into emenel

lisp/doom-editor.el

@@ -2,7 +2,12 @@
 ;;; Commentary:
 ;;; Code:
 
-(defvar doom-detect-indentation-excluded-modes '(pascal-mode so-long-mode)
+(defvar doom-detect-indentation-excluded-modes
+  '(pascal-mode
+    so-long-mode
+    ;; Automatic indent detection in org files is meaningless. Not to mention, a
+    ;; non-standard `tab-width' causes an error in org-mode.
+    org-mode)
   "A list of major modes where indentation shouldn't be auto-detected.")
 
 (defvar-local doom-inhibit-indent-detection nil

lisp/doom-lib.el

@@ -4,6 +4,7 @@
 
 ;;; Custom error types
 (define-error 'doom-error "An unexpected Doom error")
+(define-error 'doom-font-error "Could not find a font on your system" 'doom-error)
 (define-error 'doom-nosync-error "Doom hasn't been initialized yet; did you remember to run 'doom sync' in the shell?" 'doom-error)
 (define-error 'doom-core-error "Unexpected error in Doom's core" 'doom-error)
 (define-error 'doom-hook-error "Error in a Doom startup hook" 'doom-error)

lisp/doom-ui.el

@@ -210,10 +210,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
 `kill-current-buffer'."
   :before-until #'kill-current-buffer
   (let ((buf (current-buffer)))
-    (cond ((window-dedicated-p)
-           (delete-window)
-           t)
-          ((eq buf (doom-fallback-buffer))
+    (cond ((eq buf (doom-fallback-buffer))
            (message "Can't kill the fallback buffer.")
            t)
           ((doom-real-buffer-p buf)