branch: elpa/casual
commit fb8b53d56430c72f4b0deb031491159283c65193
Merge: 3c180bc168 ff993ba784
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #92 from
kickingvegas/merge-development-to-main-20241123_135234
Merge development to main 20241123_135234
---
docs/images/casual-calendar-settings-menu.png | Bin 236630 -> 242268 bytes
lisp/casual-calendar-settings.el | 12 +++++++++++-
lisp/casual-calendar-utils.el | 10 +++++-----
lisp/casual.el | 2 +-
tests/test-casual-calendar-settings.el | 1 +
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/docs/images/casual-calendar-settings-menu.png
b/docs/images/casual-calendar-settings-menu.png
index e1a14865c8..4ba882f82a 100644
Binary files a/docs/images/casual-calendar-settings-menu.png and
b/docs/images/casual-calendar-settings-menu.png differ
diff --git a/lisp/casual-calendar-settings.el b/lisp/casual-calendar-settings.el
index df39c13b95..ef6e4f923c 100644
--- a/lisp/casual-calendar-settings.el
+++ b/lisp/casual-calendar-settings.el
@@ -38,7 +38,12 @@ Customize settings for Calendar and Diary modes."
:description (lambda ()
(casual-lib-checkbox-label
calendar-mark-holidays-flag
- "Mark Holidays")))]
+ "Mark Holidays")))
+ ("E" "Mark Diary Entries"
casual-calendar--customize-calendar-mark-diary-entries-flag
+ :description (lambda ()
+ (casual-lib-checkbox-label
+ calendar-mark-diary-entries-flag
+ "Mark Diary Entries")))]
["Hooks"
("v" "Move Hook" casual-calendar--customize-calendar-move-hook)]
@@ -117,6 +122,11 @@ Customize settings for Calendar and Diary modes."
(interactive)
(customize-variable 'calendar-mark-holidays-flag))
+(defun casual-calendar--customize-calendar-mark-diary-entries-flag ()
+ "Customize variable `calendar-mark-diary-entries-flag'."
+ (interactive)
+ (customize-variable 'calendar-mark-diary-entries-flag))
+
(defun casual-calendar--customize-calendar-location-name ()
"Customize variable `calendar-location-name'."
(interactive)
diff --git a/lisp/casual-calendar-utils.el b/lisp/casual-calendar-utils.el
index 94a70d012f..1a29e819b3 100644
--- a/lisp/casual-calendar-utils.el
+++ b/lisp/casual-calendar-utils.el
@@ -32,11 +32,11 @@ by this menu."
["Diary and Goto"
["Diary Insert"
- ("e" "Entry" diary-insert-entry :transient t)
- ("w" "Weekly" diary-insert-weekly-entry :transient t)
- ("m" "Monthly" diary-insert-monthly-entry :transient t)
- ("y" "Yearly" diary-insert-yearly-entry :transient t)
- ("a" "Anniversary" diary-insert-anniversary-entry :transient t)]
+ ("e" "Entry" diary-insert-entry)
+ ("w" "Weekly" diary-insert-weekly-entry)
+ ("m" "Monthly" diary-insert-monthly-entry)
+ ("y" "Yearly" diary-insert-yearly-entry)
+ ("a" "Anniversary" diary-insert-anniversary-entry)]
["Goto"
("g" "Date…" calendar-goto-date :transient t)
diff --git a/lisp/casual.el b/lisp/casual.el
index 985b9a2fc2..18830554ca 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.2.0
+;; Version: 2.2.1-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-calendar-settings.el
b/tests/test-casual-calendar-settings.el
index 66b5eb7afc..d0579c86bd 100644
--- a/tests/test-casual-calendar-settings.el
+++ b/tests/test-casual-calendar-settings.el
@@ -35,6 +35,7 @@
(let ((test-vectors
'((:binding "C" :command
casual-calendar--customize-calendar-group)
(:binding "H" :command
casual-calendar--customize-calendar-mark-holidays-flag)
+ (:binding "E" :command
casual-calendar--customize-calendar-mark-diary-entries-flag)
(:binding "v" :command
casual-calendar--customize-calendar-move-hook)
(:binding "N" :command
casual-calendar--customize-calendar-location-name)
(:binding "A" :command
casual-calendar--customize-calendar-latitude)
