From 4d4e304446e45e0353ffc712ccaabcc4a426b1ff Mon Sep 17 00:00:00 2001 From: Daniel <89086143+BardofSprites@users.noreply.github.com> Date: Thu, 18 Jan 2024 05:07:48 -0500 Subject: fix merge conflict --- bard-emacs-modules/bard-emacs-org.el | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'bard-emacs-modules/bard-emacs-org.el') diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index a905897..36278b4 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -23,6 +23,13 @@ (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.6)) ) +;; Calendar + +(with-eval-after-load 'calendar-mode + (setq calendar-holidays (append calendar-holidays russian-holidays)) + (add-hook 'calendar-today-visible-hook 'calendar-mark-today) + (add-hook 'calendar-today-visible-hook 'calendar-mark-holidays)) + ;; Org todo keywords - changed to using hl-todo faces fixed by modus/ef themes (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "NEXT (n)" "|" "DONE(d)" "KILLED(k)"))) (add-hook 'org-mode-hook 'hl-todo-mode) -- cgit v1.2.3