branch: elpa/casual
commit 626ca08241ac61c84627616637ff4194a5ae1143
Author: Charles Choi <[email protected]>
Commit: Charles Choi <[email protected]>
Reorg Tools Menu
- Reorganize casual-editkit-tools-tmenu
- Added `calendar` command with binding M-c
- Added `erc` command with binding E
- Added `eww` command with binding M-e
---
docs/images/casual-editkit-tools-screenshot.png | Bin 166626 -> 172478 bytes
lisp/casual-editkit-utils.el | 16 +++++++++++++---
tests/test-casual-editkit-utils.el | 10 +++++++---
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/docs/images/casual-editkit-tools-screenshot.png
b/docs/images/casual-editkit-tools-screenshot.png
index 166bfee0ee..b7f177a081 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-editkit-utils.el b/lisp/casual-editkit-utils.el
index ca5e40e362..6ecb78fe77 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
+ ("M-c" "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/tests/test-casual-editkit-utils.el
b/tests/test-casual-editkit-utils.el
index e7c15cbac1..a0f3893add 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 "M-c" :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))))
