oni-org: Replace ‘map-put!’ with ‘setf’ + ‘map-elt’

‘map-put!’ doesn't work on ‘nil’. Possibly because it tries to change the value
in-place and that won't work with ‘nil’.

1 files changed, 27 insertions, 27 deletions

diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index 51f7608..c1eaa92 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2026.0629.140056
+;; Version: 2026.0629.154048
 ;; Package-Requires: (oni-hydra org org-edna diminish olivetti org-pretty-table)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -455,9 +455,9 @@ and not a state update."
 
 ;;;;; Custom Commands
 
-(map-put! org-agenda-custom-commands "n"
-  '("NEXT items"
-    ((todo "NEXT"))))
+(setf (map-elt org-agenda-custom-commands "n")
+      '("NEXT items"
+        ((todo "NEXT"))))
 
 ;;;; Capture
 
@@ -988,8 +988,8 @@ This is done by adding a ‘:hidden t’ header argument to the code block."
           text))
 
 (defvar oni-org--capture-D-date nil)
-(map-put! org-capture-templates "D"
-  '("A DONE item for my to-done list." entry (file oni-org-todo-main-file) "* DONE %?
+(setf (map-elt org-capture-templates "D")
+      '("A DONE item for my to-done list." entry (file oni-org-todo-main-file) "* DONE %?
 CLOSED: %(setq oni-org--capture-D-date (format-time-string (org-time-stamp-format t t) (org-read-date t t nil \"Date: \")))
 :PROPERTIES:
 :CREATED:  %(progn oni-org--capture-D-date)
@@ -997,22 +997,22 @@ CLOSED: %(setq oni-org--capture-D-date (format-time-string (org-time-stamp-forma
 :LOGBOOK:
 - State \"DONE\"       from \"TODO\"       %(progn oni-org--capture-D-date)
 :END:"
-    :after-finalize (lambda () (setq oni-org--capture-D-date nil))))
+        :after-finalize (lambda () (setq oni-org--capture-D-date nil))))
 
-(map-put! org-capture-templates "t"
-  '("A simple TODO item." entry (file "") "* TODO %?
+(setf (map-elt org-capture-templates "t")
+      '("A simple TODO item." entry (file "") "* TODO %?
 :PROPERTIES:
 :CREATED:  %U
 :END:"))
 
-(map-put! org-capture-templates "U"
-  '("A TODO capture from the browser." entry (file "") "* TODO %:description
+(setf (map-elt org-capture-templates "U")
+      '("A TODO capture from the browser." entry (file "") "* TODO %:description
 :PROPERTIES:
 :CREATED:  %U
 :END:
 
 %:link"
-    :immediate-finish t))
+        :immediate-finish t))
 
 (defun oni-org-find-new-note-file ()
   (let ((title (read-string "Title: ")))
@@ -1027,22 +1027,22 @@ CLOSED: %(setq oni-org--capture-D-date (format-time-string (org-time-stamp-forma
                                  oni-org-todo-dir))
     (setq-local oni-org--capture-page-title title)))
 
-(map-put! org-capture-templates "p"
-  '("A note page." plain (function oni-org-find-new-note-file) "#+TITLE: %(with-current-buffer (org-capture-get :buffer) oni-org--capture-page-title)
+(setf (map-elt org-capture-templates "p")
+      '("A note page." plain (function oni-org-find-new-note-file) "#+TITLE: %(with-current-buffer (org-capture-get :buffer) oni-org--capture-page-title)
 #+DATE: %U
 
 %?"
-    :after-finalize (lambda () (when org-note-abort
-                                 (delete-file (buffer-file-name (org-capture-get :buffer)) t)
-                                 (kill-buffer (org-capture-get :buffer))))))
+        :after-finalize (lambda () (when org-note-abort
+                                     (delete-file (buffer-file-name (org-capture-get :buffer)) t)
+                                     (kill-buffer (org-capture-get :buffer))))))
 
-(map-put! org-capture-templates "c"
-  '("Chores"))
+(setf (map-elt org-capture-templates "c")
+      '("Chores"))
 
-(map-put! org-capture-templates "cl"
-  `("Laundry" entry (file ,oni-org-todo-main-file)
-    (file ,(expand-file-name "laundry.org" oni-org-capture-template-directory))
-    :immediate-finish t))
+(setf (map-elt org-capture-templates "cl")
+      `("Laundry" entry (file ,oni-org-todo-main-file)
+        (file ,(expand-file-name "laundry.org" oni-org-capture-template-directory))
+        :immediate-finish t))
 
 (defun oni-org-get-morning-checklist ()
   "Get the template for my morning checklist."
@@ -1058,10 +1058,10 @@ CLOSED: %(setq oni-org--capture-D-date (format-time-string (org-time-stamp-forma
                    (expand-file-name "morning-checklist-trash.org" oni-org-capture-template-directory)))
         template))))
 
-(map-put! org-capture-templates "cm"
-  `("Morning Checklist" entry (file ,oni-org-todo-main-file)
-    (function oni-org-get-morning-checklist)
-    :immediate-finish t))
+(setf (map-elt org-capture-templates "cm")
+      `("Morning Checklist" entry (file ,oni-org-todo-main-file)
+        (function oni-org-get-morning-checklist)
+        :immediate-finish t))
 
 (defun oni-org-insert-link (title entry)
   (interactive