ITADN

Prepend org-modern faces to text properties

#249Pull Requestspencerjackson 创建于 2024-12-08
S
spencerjacksoncommented
This patch changes how org-modern applies faces to its elements. Instead of using `put-text-property` to set faces, this patch prepends faces with `add-face-text-property`. This allows themes to set default behaviors which are overridden by org-modern. In particular, overlines will correctly span over org-modern elements. Behavior before: ![image](https://github.com/user-attachments/assets/61911ecf-8a81-4e97-bd64-65103c11e0b0) Behavior after: ![image](https://github.com/user-attachments/assets/6ce73bc0-5e27-47fa-9429-996f955610ac) Full config using elpaca: ``` (defvar elpaca-installer-version 0.8) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" :ref nil :depth 1 :files (:defaults "elpaca-test.el" (:exclude "extensions")) :build (:not elpaca--activate-package))) (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory)) (order (cdr elpaca-order)) (default-directory repo)) (add-to-list 'load-path (if (file-exists-p build) build repo)) (unless (file-exists-p repo) (make-directory repo t) (when (< emacs-major-version 28) (require 'subr-x)) (condition-case-unless-debug err (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) ((zerop (apply #'call-process `("git" nil ,buffer t "clone" ,@(when-let* ((depth (plist-get order :depth))) (list (format "--depth=%d" depth) "--no-single-branch")) ,(plist-get order :repo) ,repo)))) ((zerop (call-process "git" nil buffer t "checkout" (or (plist-get order :ref) "--")))) (emacs (concat invocation-directory invocation-name)) ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" "--eval" "(byte-recompile-directory \".\" 0 'force)"))) ((require 'elpaca)) ((elpaca-generate-autoloads "elpaca" repo))) (progn (message "%s" (buffer-string)) (kill-buffer buffer)) (error "%s" (with-current-buffer buffer (buffer-string)))) ((error) (warn "%s" err) (delete-directory repo 'recursive)))) (unless (require 'elpaca-autoloads nil t) (require 'elpaca) (elpaca-generate-autoloads "elpaca" repo) (load "./elpaca-autoloads"))) (add-hook 'after-init-hook #'elpaca-process-queues) (elpaca `(,@elpaca-order)) (elpaca use-package) ;; Install use-package support (elpaca elpaca-use-package ;; Enable :ensure use-package keyword. (elpaca-use-package-mode) ;; Assume :ensure t unless otherwise specified. (setq use-package-always-ensure t)) ;; Block until current queue processed. (elpaca-wait) (use-package modus-themes :config ;; Configure the Modus Themes' appearance (setq modus-themes-mode-line '(accented borderless) modus-themes-bold-constructs t modus-themes-italic-constructs t modus-themes-fringes 'subtle modus-themes-tabs-accented t modus-themes-paren-match '(bold intense) modus-themes-prompts '(bold intense) ;modus-themes-completions 'opinionated modus-themes-org-blocks 'tinted-background modus-themes-scale-headings t modus-themes-region '(bg-only) modus-themes-headings '((1 . (rainbow overline background 1.4)) (2 . (rainbow background 1.3)) (3 . (rainbow bold 1.2)) (t . (semilight 1.1)))) (setq modus-themes-common-palette-overrides modus-themes-preset-overrides-intense) (setq modus-themes-scale-headings t) (setq modus-themes-mixed-fonts t) ;; Load the dark theme by default (load-theme 'modus-vivendi t) ) (use-package org-modern :hook (org-mode . org-modern-mode) (org-agenda-finalize . org-modern-agenda) :ensure (org-modern :type git :repo "~/org-modern" :branch "add-face-text-property") :config (setq ;; Edit settings org-auto-align-tags nil org-tags-column 0 org-catch-invisible-edits 'show-and-error org-special-ctrl-a/e t org-insert-heading-respect-content t ;; Org styling, hide markup etc. org-hide-emphasis-markers t org-pretty-entities t org-ellipsis "…" ;; Agenda styling org-agenda-tags-column 0 org-agenda-block-separator ?─ org-agenda-time-grid '((daily today require-timed) (800 1000 1200 1400 1600 1800 2000) " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄") org-agenda-current-time-string "◀── now ─────────────────────────────────────────────────")) ``` The `:ensure` for org-modern will need to be tweaked for your environment.
合并状态:未合并 关闭于 2025-04-03 1 条评论