mirrors/doomemacs
1
Fork 0
mirror of https://github.com/doomemacs/doomemacs.git synced 2025-12-06 02:30:33 -08:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirrors:a4a61976dcc7247b59506cada0351f846519d08e
Branches Tags
mirrors:master
mirrors:feature/tabspaces
mirrors:screenshots
mirrors:v2.0.9
mirrors:v2.0.8
mirrors:v2.0.7
mirrors:v2.0.6
mirrors:v2.0.5
mirrors:v2.0.4
mirrors:v2.0.3
mirrors:v2.0
mirrors:v1.3
mirrors:v1.2
mirrors:v1.1
mirrors:v1.0
mirrors:v0.9
mirrors:v0.7
...
compare: mirrors:9ef731939a130975227ac21370c09999f0dbccb3
Branches Tags
mirrors:master
mirrors:feature/tabspaces
mirrors:screenshots
mirrors:v2.0.9
mirrors:v2.0.8
mirrors:v2.0.7
mirrors:v2.0.6
mirrors:v2.0.5
mirrors:v2.0.4
mirrors:v2.0.3
mirrors:v2.0
mirrors:v1.3
mirrors:v1.2
mirrors:v1.1
mirrors:v1.0
mirrors:v0.9
mirrors:v0.7

2 commits
a4a61976dc ... 9ef731939a

Author SHA1 Message Date
KARASZI István
9ef731939a bump: :lang clojure 
clojure-emacs/cider@389833f85a -> clojure-emacs/cider@fb7aa88812
clojure-emacs/clojure-ts-mode@32490c80fa -> clojure-emacs/clojure-ts-mode@96fdffcbe9
 2025-12-04 16:28:56 -05:00
Henrik Lissner
4186b63b38
fix(calendar): adapt to upstream refactor 
A large scale refactor upstream renamed the cfw: prefix with calfw-.

Amend: 5222baa373
Fix: #8598
Ref: kiwanami/emacs-calfw@b7c26ecbe9
 2025-12-04 14:02:06 -05:00
4 changed files with 82 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/app/calendar/README.org
View file

@ -16,6 +16,8 @@ support.
** Packages ** Packages
- [[doom-package:calfw]] - [[doom-package:calfw]]
- [[doom-package:calfw-org]] - [[doom-package:calfw-org]]
- [[doom-package:calfw-cal]]
- [[doom-package:calfw-ical]]
- [[doom-package:org-gcal]] - [[doom-package:org-gcal]]
** Hacks ** Hacks
@ -48,15 +50,15 @@ calendar data from:
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun my-open-calendar () (defun my-open-calendar ()
(interactive) (interactive)
(cfw:open-calendar-buffer (calfw-open-calendar-buffer
:contents-sources :contents-sources
(list (list
(cfw:org-create-source "Green") ; org-agenda source (calfw-org-create-source "Green") ; org-agenda source
(cfw:org-create-file-source "cal" "/path/to/cal.org" "Cyan") ; other org source (calfw-org-create-file-source "cal" "/path/to/cal.org" "Cyan") ; other org source
(cfw:howm-create-source "Blue") ; howm source (calfw-howm-create-source "Blue") ; howm source
(cfw:cal-create-source "Orange") ; diary source (calfw-cal-create-source "Orange") ; diary source
(cfw:ical-create-source "Moon" "~/moon.ics" "Gray") ; ICS source1 (calfw-ical-create-source "Moon" "~/moon.ics" "Gray") ; ICS source1
(cfw:ical-create-source "gcal" "https://..../basic.ics" "IndianRed") ; google calendar ICS (calfw-ical-create-source "gcal" "https://..../basic.ics" "IndianRed") ; google calendar ICS
))) )))
#+end_src #+end_src

24
modules/app/calendar/autoload.el
View file

@ -5,9 +5,7 @@
"Name of the workspace created by `=calendar', dedicated to calfw.") "Name of the workspace created by `=calendar', dedicated to calfw.")
(defun +calendar--init () (defun +calendar--init ()
(if-let* ((win (cl-find-if (lambda (b) (string-match-p "^\\*cfw:" (buffer-name b))) (if-let* ((win (get-buffer-window calfw-calendar-buffer-name)))
(doom-visible-windows)
:key #'window-buffer)))
(select-window win) (select-window win)
(call-interactively +calendar-open-function))) (call-interactively +calendar-open-function)))
@ -20,8 +18,8 @@
(+workspace-switch +calendar-workspace-name t) (+workspace-switch +calendar-workspace-name t)
(unless (memq (buffer-local-value 'major-mode (unless (memq (buffer-local-value 'major-mode
(window-buffer (selected-window))) (window-buffer (selected-window)))
'(cfw:details-mode '(calfw-details-mode
cfw:calendar-mode)) calfw-calendar-mode))
(doom/switch-to-scratch-buffer) (doom/switch-to-scratch-buffer)
(+calendar--init)) (+calendar--init))
(+workspace/display)) (+workspace/display))
@ -46,24 +44,24 @@
(defun +calendar/open-calendar () (defun +calendar/open-calendar ()
"TODO" "TODO"
(interactive) (interactive)
(cfw:open-calendar-buffer (calfw-open-calendar-buffer
;; :custom-map cfw:my-cal-map ;; :custom-map calfw-my-cal-map
:contents-sources :contents-sources
(list (list
(cfw:org-create-source (face-foreground 'default)) ; orgmode source (calfw-org-create-source (face-foreground 'default)) ; orgmode source
))) )))
;;;###autoload ;;;###autoload
(defun +calendar-cfw:render-button-a (title command &optional state) (defun +calendar-calfw-render-button-a (title command &optional state)
"render-button "render-button
TITLE TITLE
COMMAND COMMAND
STATE" STATE"
(let ((text (concat " " title " ")) (let ((text (concat " " title " "))
(keymap (make-sparse-keymap))) (keymap (make-sparse-keymap)))
(cfw:rt text (if state 'cfw:face-toolbar-button-on (calfw-rt text (if state 'calfw-face-toolbar-button-on
'cfw:face-toolbar-button-off)) 'calfw-face-toolbar-button-off))
(define-key keymap [mouse-1] command) (define-key keymap [mouse-1] command)
(cfw:tp text 'keymap keymap) (calfw-tp text 'keymap keymap)
(cfw:tp text 'mouse-face 'highlight) (calfw-tp text 'mouse-face 'highlight)
text)) text))

120
modules/app/calendar/config.el
View file

@ -8,83 +8,83 @@
;; Packages ;; Packages
(use-package! calfw (use-package! calfw
:commands cfw:open-calendar-buffer :commands calfw-open-calendar-buffer
:config :config
;; better frame for calendar ;; better frame for calendar
(setq cfw:face-item-separator-color nil (setq calfw-face-item-separator-color nil
cfw:render-line-breaker 'cfw:render-line-breaker-none calfw-render-line-breaker 'calfw-render-line-breaker-none
cfw:fchar-junction ?╋ calfw-fchar-junction ?╋
cfw:fchar-vertical-line ?┃ calfw-fchar-vertical-line ?┃
cfw:fchar-horizontal-line ?━ calfw-fchar-horizontal-line ?━
cfw:fchar-left-junction ?┣ calfw-fchar-left-junction ?┣
cfw:fchar-right-junction ?┫ calfw-fchar-right-junction ?┫
cfw:fchar-top-junction ?┯ calfw-fchar-top-junction ?┯
cfw:fchar-top-left-corner ?┏ calfw-fchar-top-left-corner ?┏
cfw:fchar-top-right-corner ?┓) calfw-fchar-top-right-corner ?┓)
(set-popup-rule! "^\\*cfw:details" :quit t :ttl 0 :select t :size 0.4) (set-popup-rule! "^\\*calfw-details" :quit t :ttl 0 :select t :size 0.4)
(define-key cfw:calendar-mode-map "q" #'+calendar/quit) (define-key calfw-calendar-mode-map "q" #'+calendar/quit)
(when (modulep! :editor evil +everywhere) (when (modulep! :editor evil +everywhere)
(set-evil-initial-state! '(cfw:calendar-mode cfw:details-mode) 'motion) (set-evil-initial-state! '(calfw-calendar-mode calfw-details-mode) 'motion)
(add-hook! '(cfw:calendar-mode-hook cfw:details-mode-hook) #'evil-normalize-keymaps) (add-hook! '(calfw-calendar-mode-hook calfw-details-mode-hook) #'evil-normalize-keymaps)
(map! (:map cfw:calendar-mode-map (map! (:map calfw-calendar-mode-map
:m "q" #'+calendar/quit :m "q" #'+calendar/quit
:m "SPC" #'cfw:show-details-command :m "SPC" #'calfw-show-details-command
:m "RET" #'cfw:show-details-command :m "RET" #'calfw-show-details-command
:m "TAB" #'cfw:navi-prev-item-command :m "TAB" #'calfw-navi-prev-item-command
:m [tab] #'cfw:navi-prev-item-command :m [tab] #'calfw-navi-prev-item-command
:m [backtab] #'cfw:navi-next-item-command :m [backtab] #'calfw-navi-next-item-command
:m "$" #'cfw:navi-goto-week-end-command :m "$" #'calfw-navi-goto-week-end-command
:m "." #'cfw:navi-goto-today-command :m "." #'calfw-navi-goto-today-command
:m "<" #'cfw:navi-previous-month-command :m "<" #'calfw-navi-previous-month-command
:m ">" #'cfw:navi-next-month-command :m ">" #'calfw-navi-next-month-command
:m "C-h" #'cfw:navi-previous-month-command :m "C-h" #'calfw-navi-previous-month-command
:m "C-l" #'cfw:navi-next-month-command :m "C-l" #'calfw-navi-next-month-command
:m "D" #'cfw:change-view-day :m "D" #'calfw-change-view-day
:m "M" #'cfw:change-view-month :m "M" #'calfw-change-view-month
:m "T" #'cfw:change-view-two-weeks :m "T" #'calfw-change-view-two-weeks
:m "W" #'cfw:change-view-week :m "W" #'calfw-change-view-week
:m "^" #'cfw:navi-goto-week-begin-command :m "^" #'calfw-navi-goto-week-begin-command
:m "gr" #'cfw:refresh-calendar-buffer :m "gr" #'calfw-refresh-calendar-buffer
:m "h" #'cfw:navi-previous-day-command :m "h" #'calfw-navi-previous-day-command
:m "H" #'cfw:navi-goto-first-date-command :m "H" #'calfw-navi-goto-first-date-command
:m "j" #'cfw:navi-next-week-command :m "j" #'calfw-navi-next-week-command
:m "k" #'cfw:navi-previous-week-command :m "k" #'calfw-navi-previous-week-command
:m "l" #'cfw:navi-next-day-command :m "l" #'calfw-navi-next-day-command
:m "L" #'cfw:navi-goto-last-date-command :m "L" #'calfw-navi-goto-last-date-command
:m "t" #'cfw:navi-goto-today-command) :m "t" #'calfw-navi-goto-today-command)
(:map cfw:details-mode-map (:map calfw-details-mode-map
:m "SPC" #'cfw:details-kill-buffer-command :m "SPC" #'calfw-details-kill-buffer-command
:m "RET" #'cfw:details-kill-buffer-command :m "RET" #'calfw-details-kill-buffer-command
:m "TAB" #'cfw:details-navi-prev-item-command :m "TAB" #'calfw-details-navi-prev-item-command
:m [tab] #'cfw:details-navi-prev-item-command :m [tab] #'calfw-details-navi-prev-item-command
:m [backtab] #'cfw:details-navi-next-item-command :m [backtab] #'calfw-details-navi-next-item-command
:m "q" #'cfw:details-kill-buffer-command :m "q" #'calfw-details-kill-buffer-command
:m "C-h" #'cfw:details-navi-prev-command :m "C-h" #'calfw-details-navi-prev-command
:m "C-l" #'cfw:details-navi-next-command :m "C-l" #'calfw-details-navi-next-command
:m "C-k" #'cfw:details-navi-prev-item-command :m "C-k" #'calfw-details-navi-prev-item-command
:m "C-j" #'cfw:details-navi-next-item-command))) :m "C-j" #'calfw-details-navi-next-item-command)))
(add-hook 'cfw:calendar-mode-hook #'doom-mark-buffer-as-real-h) (add-hook 'calfw-calendar-mode-hook #'doom-mark-buffer-as-real-h)
(add-hook 'cfw:calendar-mode-hook #'hide-mode-line-mode) (add-hook 'calfw-calendar-mode-hook #'hide-mode-line-mode)
(advice-add #'cfw:render-button :override #'+calendar-cfw:render-button-a)) (advice-add #'calfw-render-button :override #'+calendar-calfw-render-button-a))
(use-package! calfw-org (use-package! calfw-org
:commands (cfw:open-org-calendar :commands (calfw-open-org-calendar
cfw:org-create-source calfw-org-create-source
cfw:org-create-file-source calfw-org-create-file-source
cfw:open-org-calendar-withkevin)) calfw-open-org-calendar-withkevin))
(use-package! calfw-cal (use-package! calfw-cal
:commands (cfw:cal-create-source)) :commands (calfw-cal-create-source))
(use-package! calfw-ical (use-package! calfw-ical
:commands (cfw:ical-create-source)) :commands (calfw-ical-create-source))
(use-package! org-gcal (use-package! org-gcal

4
modules/lang/clojure/packages.el
View file

@ -16,9 +16,9 @@
;;; Core packages ;;; Core packages
(package! clojure-mode :pin "28dc02114ae70db6bb68d537ea77985f272120bc") (package! clojure-mode :pin "28dc02114ae70db6bb68d537ea77985f272120bc")
(when (and (modulep! +tree-sitter) (treesit-available-p)) (when (and (modulep! +tree-sitter) (treesit-available-p))
(package! clojure-ts-mode :pin "32490c80fad7d27367b08d967e8184f75b4ca19e")) (package! clojure-ts-mode :pin "96fdffcbe9e1b8ebf9ad14e23b06f62cc3422e22"))
(package! clj-refactor :pin "362cb46bf808dc42d2aaf022afe93048439680c4") (package! clj-refactor :pin "362cb46bf808dc42d2aaf022afe93048439680c4")
(package! cider :pin "389833f85a8f7e648de73fd9a625674c8ecf85e9") (package! cider :pin "fb7aa888125dfd5f174b6c208deca66d3fc129ab")
(when (modulep! :checkers syntax -flymake) (when (modulep! :checkers syntax -flymake)
(package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf")) (package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf"))
(package! jet :pin "c9a92675efd802f37df5e3eab7858dbbeced6ea4") (package! jet :pin "c9a92675efd802f37df5e3eab7858dbbeced6ea4")