emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(indent-guides): add +indent-guides-inhibit-functions

Browse source 
Also adds a fix for indent-guides breaking inline images in
ein:notebook-mode (#6438).

Fix: #6438
Ref: 29277c9b02
This commit is contained in:
Henrik Lissner 2024-07-28 18:57:12 -04:00
parent 559c1eef39
commit 5f798cf8e7
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/ui/indent-guides/config.el
View file

@ -1,10 +1,39 @@
;;; ui/indent-guides/config.el -*- lexical-binding: t; -*- ;;; ui/indent-guides/config.el -*- lexical-binding: t; -*-
(defcustom +indent-guides-inhibit-functions nil
"A list of predicate functions.
Each function will be run in the context of a buffer where
`highlight-indent-guides-mode' should be enabled. If any function returns
non-nil, the mode will not be activated."
:type 'hook
:group '+indent-guides)
;;
;;; Packages
(use-package! highlight-indent-guides (use-package! highlight-indent-guides
:hook ((prog-mode text-mode conf-mode) . highlight-indent-guides-mode) :hook ((prog-mode text-mode conf-mode) . +indent-guides-init-maybe-h)
:init :init
(setq highlight-indent-guides-method (if (display-graphic-p) 'bitmap 'character) (setq highlight-indent-guides-method (if (display-graphic-p) 'bitmap 'character)
highlight-indent-guides-bitmap-function #'highlight-indent-guides--bitmap-line) highlight-indent-guides-bitmap-function #'highlight-indent-guides--bitmap-line)
(defun +indent-guides-init-maybe-h ()
"Enable `highlight-indent-guides-mode'.
Consults `+indent-guides-inhibit-functions'."
(unless (run-hook-with-args-until-success '+indent-guides-inhibit-functions)
(highlight-indent-guides-mode +1)))
(add-hook! '+indent-guides-inhibit-functions
;; Org's virtual indentation messes up indent-guides.
(defun +indent-guides-in-org-indent-mode-p ()
(bound-and-true-p org-indent-mode))
;; Fix #6438: indent-guides prevent inline images from displaying in ein
;; notebooks.
(defun +indent-guides-in-ein-notebook-p ()
(and (bound-and-true-p ein:notebook-mode)
(bound-and-true-p ein:output-area-inlined-images))))
:config :config
;; HACK: If this package is loaded too early (by the user, and in terminal ;; HACK: If this package is loaded too early (by the user, and in terminal
;; Emacs), then `highlight-indent-guides-auto-set-faces' will have been ;; Emacs), then `highlight-indent-guides-auto-set-faces' will have been
@ -12,11 +41,4 @@
;; need to call it again, but at a time when I can ensure a frame exists an ;; need to call it again, but at a time when I can ensure a frame exists an
;; the current theme is loaded. ;; the current theme is loaded.
(when (doom-context-p 'init) (when (doom-context-p 'init)
(add-hook 'doom-first-buffer-hook #'highlight-indent-guides-auto-set-faces)) (add-hook 'doom-first-buffer-hook #'highlight-indent-guides-auto-set-faces)))
;; `highlight-indent-guides' breaks when `org-indent-mode' is active
(add-hook! 'org-mode-local-vars-hook
(defun +indent-guides-disable-maybe-h ()
(and highlight-indent-guides-mode
(bound-and-true-p org-indent-mode)
(highlight-indent-guides-mode -1)))))