branch: elpa/casual
commit 93999588d4390d7dd7d4c46d2a7332632f2ea83f
Merge: 1f55785341 5a9b48a060
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>

    Merge pull request #66 from 
kickingvegas/merge-development-to-main-20241109_141921
    
    Merge development to main 20241109_141921
---
 README.org                                         |   2 ++
 .../images/casual-agenda-operations-screenshot.png | Bin 256156 -> 241379 bytes
 docs/images/casual-editkit-tools-screenshot.png    | Bin 166626 -> 165928 bytes
 lisp/casual-agenda.el                              |   4 ++--
 lisp/casual-editkit-utils.el                       |  16 +++++++++++++---
 lisp/casual.el                                     |   2 +-
 tests/test-casual-agenda.el                        |   4 +++-
 tests/test-casual-editkit-utils.el                 |  10 +++++++---
 8 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/README.org b/README.org
index 528f1a7a0b..48f43a7435 100644
--- a/README.org
+++ b/README.org
@@ -1,3 +1,5 @@
+[[https://melpa.org/#/casual][file:https://melpa.org/packages/casual-badge.svg]]
 
[[https://stable.melpa.org/#/casual][file:https://stable.melpa.org/packages/casual-badge.svg]]
+
 * Casual
 A collection of opinionated 
[[https://github.com/magit/transient][Transient]]-based keyboard-driven user 
interfaces for various built-in Emacs modes.
 
diff --git a/docs/images/casual-agenda-operations-screenshot.png 
b/docs/images/casual-agenda-operations-screenshot.png
index ef41c3dfeb..30dd22e2c7 100644
Binary files a/docs/images/casual-agenda-operations-screenshot.png and 
b/docs/images/casual-agenda-operations-screenshot.png differ
diff --git a/docs/images/casual-editkit-tools-screenshot.png 
b/docs/images/casual-editkit-tools-screenshot.png
index 166bfee0ee..eac3bdbf60 100644
Binary files a/docs/images/casual-editkit-tools-screenshot.png and 
b/docs/images/casual-editkit-tools-screenshot.png differ
diff --git a/lisp/casual-agenda.el b/lisp/casual-agenda.el
index ceaa634953..e56b33e9c8 100644
--- a/lisp/casual-agenda.el
+++ b/lisp/casual-agenda.el
@@ -148,8 +148,8 @@
      :transient t)]
    [("R" "Refile…" org-agenda-refile)
     ("z" "Add Note" org-agenda-add-note)]
-   [("A" "Archive…" org-agenda-archive-default-with-confirmation)]]
-
+   [("S" "Set Property…" org-agenda-set-property)
+    ("A" "Archive…" org-agenda-archive-default-with-confirmation)]]
 
   ["Clock"
    :class transient-row
diff --git a/lisp/casual-editkit-utils.el b/lisp/casual-editkit-utils.el
index ca5e40e362..59014f5ac9 100644
--- a/lisp/casual-editkit-utils.el
+++ b/lisp/casual-editkit-utils.el
@@ -554,7 +554,7 @@ accessed here."
 
 Commands pertaining to invoking different tools can be accessed here."
   ["Tools"
-   ["Shells & Interpreters"
+   ["Shells & REPLs"
     ("s" "Shell" shell)
     ("e" "Eshell" eshell)
     ("i" "IELM" ielm)
@@ -563,12 +563,22 @@ Commands pertaining to invoking different tools can be 
accessed here."
 
    ["Utilities"
     ("c" "Calc" calc)
-    ;;("W" "Weather" weather)
     ("r" "RE-Builder" re-builder)
-    ("w" "Word Count" (lambda () (interactive) (call-interactively 
#'count-words)))
+    ("w" "Word Count" (lambda ()
+                        (interactive)
+                        (call-interactively #'count-words)))]
+
+   ["Almanac"
+    :pad-keys t
+    ("a" "Calendar" calendar)
     ("C" "World Clock" world-clock)
     ("S" "Sunrise/Sunset" sunrise-sunset)]
 
+   ["Misc"
+    :pad-keys t
+    ("E" "erc" erc)
+    ("M-e" "eww" eww)]
+
    ["Fun"
     ("T" "Tetris" tetris)
     ("z" "Zone" zone)]]
diff --git a/lisp/casual.el b/lisp/casual.el
index e3929d80b9..a1b61d4e3e 100644
--- a/lisp/casual.el
+++ b/lisp/casual.el
@@ -5,7 +5,7 @@
 ;; Author: Charles Choi <[email protected]>
 ;; URL: https://github.com/kickingvegas/casual
 ;; Keywords: tools, wp
-;; Version: 2.0.7
+;; Version: 2.0.8-rc.1
 ;; Package-Requires: ((emacs "29.1") (transient "0.6.0"))
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-casual-agenda.el b/tests/test-casual-agenda.el
index 0931fe1966..94456f3799 100644
--- a/tests/test-casual-agenda.el
+++ b/tests/test-casual-agenda.el
@@ -204,7 +204,8 @@
             (casualt-mock #'org-agenda-redo)
             (casualt-mock #'org-agenda-redo-all)
             (casualt-mock #'org-agenda-goto-date)
-            (casualt-mock #'org-agenda-clock-goto))
+            (casualt-mock #'org-agenda-clock-goto)
+            (casualt-mock #'org-agenda-set-property))
 
     (let ((test-vectors
            '((:binding "t" :command org-agenda-todo)
@@ -215,6 +216,7 @@
              (:binding "-" :command org-agenda-priority-down)
              (:binding "R" :command org-agenda-refile)
              (:binding "z" :command org-agenda-add-note)
+             (:binding "S" :command org-agenda-set-property)
              (:binding "A" :command 
org-agenda-archive-default-with-confirmation)
 
              (:binding "I" :command casual-agenda-clock-in)
diff --git a/tests/test-casual-editkit-utils.el 
b/tests/test-casual-editkit-utils.el
index e7c15cbac1..364577b6e0 100644
--- a/tests/test-casual-editkit-utils.el
+++ b/tests/test-casual-editkit-utils.el
@@ -493,24 +493,28 @@
               (casualt-mock #'weather)
               (casualt-mock #'re-builder)
               (casualt-mock #'count-words)
+              (casualt-mock #'calendar)
               (casualt-mock #'world-clock)
               (casualt-mock #'sunrise-sunset)
+              (casualt-mock #'erc)
+              (casualt-mock #'eww)
               (casualt-mock #'tetris)
               (casualt-mock #'zone))
 
       (let ((test-vectors
-             '(
-               (:binding "s" :command shell)
+             '((:binding "s" :command shell)
                (:binding "e" :command eshell)
                (:binding "i" :command ielm)
                (:binding "t" :command term)
                (:binding "p" :command run-python)
                (:binding "c" :command calc)
-               ;;(:binding "W" :command weather)
                (:binding "r" :command re-builder)
                (:binding "w" :command count-words)
+               (:binding "a" :command calendar)
                (:binding "C" :command world-clock)
                (:binding "S" :command sunrise-sunset)
+               (:binding "E" :command erc)
+               (:binding "M-e" :command eww)
                (:binding "z" :command zone)
                (:binding "T" :command tetris))))
 

Reply via email to