branch: elpa/casual
commit 9f8ce22a77f9d68a42aa4f927a16efe01a894752
Merge: 0ba181cbef 704f226520
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #164 from
kickingvegas/merge-development-to-main-20250211_115105
Merge development to main 20250211_115105
---
docs/images/casual-editkit-delete-screenshot.png | Bin 171642 -> 134463 bytes
docs/images/casual-editkit-main-screenshot.png | Bin 242099 -> 228117 bytes
lisp/casual-editkit-utils.el | 3 ++-
lisp/casual-editkit.el | 4 +++-
lisp/casual-image-utils.el | 1 +
lisp/casual.el | 2 +-
tests/test-casual-editkit-utils.el | 2 ++
tests/test-casual-editkit.el | 4 ++++
8 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/docs/images/casual-editkit-delete-screenshot.png
b/docs/images/casual-editkit-delete-screenshot.png
index 71207e48b8..a0d8776b6f 100644
Binary files a/docs/images/casual-editkit-delete-screenshot.png and
b/docs/images/casual-editkit-delete-screenshot.png differ
diff --git a/docs/images/casual-editkit-main-screenshot.png
b/docs/images/casual-editkit-main-screenshot.png
index a169d9d26a..42cb971bfb 100644
Binary files a/docs/images/casual-editkit-main-screenshot.png and
b/docs/images/casual-editkit-main-screenshot.png differ
diff --git a/lisp/casual-editkit-utils.el b/lisp/casual-editkit-utils.el
index 8c4fa58937..1cbe723bc6 100644
--- a/lisp/casual-editkit-utils.el
+++ b/lisp/casual-editkit-utils.el
@@ -386,7 +386,8 @@ Commands pertaining to delete can be accessed here."
["Delete"
[("o" "Just One Space" just-one-space)
("j" "Join Line" join-line)
- ("h" "Horizontal Space" delete-horizontal-space)]
+ ("h" "Horizontal Space" delete-horizontal-space)
+ ("p" "Pair" delete-pair)]
[("b" "Blank Lines" delete-blank-lines)
("w" "Whitespace Cleanup" whitespace-cleanup)
diff --git a/lisp/casual-editkit.el b/lisp/casual-editkit.el
index 76934e2501..cf00c99cdd 100644
--- a/lisp/casual-editkit.el
+++ b/lisp/casual-editkit.el
@@ -109,7 +109,9 @@ user-customized menu."
("/" "Search/Replace›" casual-editkit-search-tmenu)
("P" "Project›" casual-editkit-project-tmenu)]
- [("M" "Macros›" casual-editkit-macro-tmenu)]]
+ [("M" "Macros›" casual-editkit-macro-tmenu)
+ ("F" "Font Scale…" text-scale-adjust
+ :if display-graphic-p)]]
;; casual-editkit-cursor-navigation-group
diff --git a/lisp/casual-image-utils.el b/lisp/casual-image-utils.el
index e31e721a2a..a00fb2e970 100644
--- a/lisp/casual-image-utils.el
+++ b/lisp/casual-image-utils.el
@@ -25,6 +25,7 @@
;;; Code:
(require 'image)
+(require 'image-crop)
(require 'casual-lib)
(defconst casual-image-unicode-db
diff --git a/lisp/casual.el b/lisp/casual.el
index 75577841e9..b66dde1602 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.3.1
+;; Version: 2.3.2-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-editkit-utils.el
b/tests/test-casual-editkit-utils.el
index 18b89adcfe..c845a84243 100644
--- a/tests/test-casual-editkit-utils.el
+++ b/tests/test-casual-editkit-utils.el
@@ -291,6 +291,7 @@
(cl-letf ((casualt-mock #'just-one-space)
(casualt-mock #'join-line)
(casualt-mock #'delete-horizontal-space)
+ (casualt-mock #'delete-pair)
(casualt-mock #'delete-blank-lines)
(casualt-mock #'whitespace-cleanup)
(casualt-mock #'delete-trailing-whitespace)
@@ -301,6 +302,7 @@
'((:binding "o" :command just-one-space)
(:binding "j" :command join-line)
(:binding "h" :command delete-horizontal-space)
+ (:binding "p" :command delete-pair)
(:binding "b" :command delete-blank-lines)
(:binding "w" :command whitespace-cleanup)
(:binding "d" :command delete-trailing-whitespace)
diff --git a/tests/test-casual-editkit.el b/tests/test-casual-editkit.el
index 1dab805df3..5d0ecff5b9 100644
--- a/tests/test-casual-editkit.el
+++ b/tests/test-casual-editkit.el
@@ -34,6 +34,7 @@
(cl-letf (((symbol-function #'casual-editkit-version-controlled-p) (lambda
() t))
((symbol-function
#'casual-editkit-package-symbol-overlay-installed-p) (lambda () t))
((symbol-function #'casual-editkit-package-magit-installed-p)
(lambda () t))
+ ((symbol-function #'display-graphic-p) (lambda (&optional d) t))
(casualt-mock #'find-file)
(casualt-mock #'dired-jump-other-window)
(casualt-mock #'ibuffer)
@@ -54,6 +55,7 @@
(casualt-mock #'compile)
(casualt-mock #'quick-calc)
(casualt-mock #'shell-command)
+ (casualt-mock #'text-scale-adjust)
(casualt-mock #'make-frame-command)
(casualt-mock #'undo)
@@ -98,6 +100,8 @@
(:binding "P" :command casual-editkit-project-tmenu)
(:binding "/" :command casual-editkit-search-tmenu)
+ (:binding "M" :command casual-editkit-macro-tmenu)
+ (:binding "F" :command text-scale-adjust)
(:binding "r" :command casual-editkit-registers-tmenu)
(:binding "U" :command undo)
