branch: elpa/casual
commit 375183e39a35bd4e67378507941177ebeb6ba021
Merge: 4f14eac613 1a7035f8c6
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>

    Merge pull request #295 from 
kickingvegas/merge-development-to-main-20250817_164426
    
    Merge development to main 20250817_164426
---
 docs/casual.info                                 | Bin 121770 -> 121770 bytes
 docs/casual.org                                  |   2 +-
 docs/casual.texi                                 |   4 ++--
 docs/images/casual-editkit-narrow-screenshot.png | Bin 43711 -> 41152 bytes
 lisp/casual-dired-utils.el                       |   2 --
 lisp/casual-editkit-utils.el                     |   7 +++++--
 lisp/casual-eshell-utils.el                      |   1 +
 lisp/casual-info-utils.el                        |   4 ++--
 lisp/casual.el                                   |   2 +-
 tests/test-casual-dired-utils.el                 |   1 -
 tests/test-casual-editkit-utils.el               |   9 ++++++---
 11 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docs/casual.info b/docs/casual.info
index d83e4bbc9e..d98d560ce1 100644
Binary files a/docs/casual.info and b/docs/casual.info differ
diff --git a/docs/casual.org b/docs/casual.org
index f0d8364e73..716792ca31 100644
--- a/docs/casual.org
+++ b/docs/casual.org
@@ -5,7 +5,7 @@
 #+EMAIL: [email protected]
 #+OPTIONS: ':t toc:t author:t email:t H:4 f:t
 #+LANGUAGE: en
-#+MACRO: version 2.8.3
+#+MACRO: version 2.8.4
 #+MACRO: kbd (eval (org-texinfo-kbd-macro $1))
 #+TEXINFO_FILENAME: casual.info
 #+TEXINFO_CLASS: casual
diff --git a/docs/casual.texi b/docs/casual.texi
index d8db1f0af5..a63c8fa56c 100644
--- a/docs/casual.texi
+++ b/docs/casual.texi
@@ -20,7 +20,7 @@ Copyright © 2024-2025 Charles Y@. Choi
 @finalout
 @titlepage
 @title Casual User Guide
-@subtitle for version 2.8.3
+@subtitle for version 2.8.4
 @author Charles Y@. Choi (@email{kickingvegas@@gmail.com})
 @page
 @vskip 0pt plus 1filll
@@ -33,7 +33,7 @@ Copyright © 2024-2025 Charles Y@. Choi
 @node Top
 @top Casual User Guide
 
-Version: 2.8.3
+Version: 2.8.4
 
 Casual is a project to re-imagine the primary user interface for Emacs using 
keyboard-driven menus.
 
diff --git a/docs/images/casual-editkit-narrow-screenshot.png 
b/docs/images/casual-editkit-narrow-screenshot.png
index fa64441401..a9b8ff6088 100644
Binary files a/docs/images/casual-editkit-narrow-screenshot.png and 
b/docs/images/casual-editkit-narrow-screenshot.png differ
diff --git a/lisp/casual-dired-utils.el b/lisp/casual-dired-utils.el
index ae8426ea63..28454a0993 100644
--- a/lisp/casual-dired-utils.el
+++ b/lisp/casual-dired-utils.el
@@ -26,7 +26,6 @@
 (require 'dired)
 (require 'dired-x)
 (require 'checkdoc)
-(require 'elint)
 (require 'casual-lib)
 (require 'casual-dired-variables)
 
@@ -99,7 +98,6 @@ ASCII-range string."
     ("L" "Load" dired-do-load :transient nil)]
 
    ["Verification"
-    ("e" "Lint Directory…" elint-directory :transient nil)
     ("c" "Check documentation strings" checkdoc-dired :transient nil)]]
 
   [:class transient-row
diff --git a/lisp/casual-editkit-utils.el b/lisp/casual-editkit-utils.el
index cba11853b5..a93e0ae027 100644
--- a/lisp/casual-editkit-utils.el
+++ b/lisp/casual-editkit-utils.el
@@ -796,9 +796,12 @@ accessed here."
   "Menu for narrow commands."
 
   ["Narrow"
+   ["Page"
+    ("p" "Page" narrow-to-page)]
+
    ["Programming"
-    ("d" "Defun" narrow-to-defun
-     :if (lambda () (derived-mode-p 'prog-mode)))]
+    :if (lambda () (derived-mode-p 'prog-mode))
+    ("d" "Defun" narrow-to-defun)]
 
    ["Org"
     :if (lambda () (derived-mode-p 'org-mode))
diff --git a/lisp/casual-eshell-utils.el b/lisp/casual-eshell-utils.el
index 2ec9503ab7..1f98ff0da5 100644
--- a/lisp/casual-eshell-utils.el
+++ b/lisp/casual-eshell-utils.el
@@ -24,6 +24,7 @@
 ;;; Code:
 
 (require 'eshell)
+(require 'em-alias)
 (require 'tramp)
 (require 'casual-lib)
 
diff --git a/lisp/casual-info-utils.el b/lisp/casual-info-utils.el
index 30c87177ce..ac70dec54a 100644
--- a/lisp/casual-info-utils.el
+++ b/lisp/casual-info-utils.el
@@ -62,7 +62,7 @@ plain ASCII-range string."
   (backward-paragraph 2)
   (forward-line))
 
-(make-obsolete #'casual-info-browse-backward-paragraph
+(make-obsolete 'casual-info-browse-backward-paragraph
                #'casual-lib-browse-backward-paragraph
                "2.6.0")
 
@@ -73,7 +73,7 @@ plain ASCII-range string."
   (forward-paragraph)
   (forward-line))
 
-(make-obsolete #'casual-info-browse-forward-paragraph
+(make-obsolete 'casual-info-browse-forward-paragraph
                #'casual-lib-browse-forward-paragraph
                "2.6.0")
 
diff --git a/lisp/casual.el b/lisp/casual.el
index 5ffa8847ea..e38beae13f 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.8.3
+;; Version: 2.8.4-rc.1
 ;; Package-Requires: ((emacs "29.1") (transient "0.9.0"))
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-casual-dired-utils.el b/tests/test-casual-dired-utils.el
index d0d90084b4..e0fbffda5b 100644
--- a/tests/test-casual-dired-utils.el
+++ b/tests/test-casual-dired-utils.el
@@ -79,7 +79,6 @@
     (push (casualt-suffix-test-vector "L" #'dired-do-load) test-vectors)
     (push (casualt-suffix-test-vector "D" #'byte-recompile-directory) 
test-vectors)
     (push (casualt-suffix-test-vector "c" #'checkdoc-dired) test-vectors)
-    (push (casualt-suffix-test-vector "e" #'elint-directory) test-vectors)
     (casualt-suffix-testbench-runner test-vectors
                                      #'casual-dired-elisp-tmenu
                                      '(lambda () (random 5000))))
diff --git a/tests/test-casual-editkit-utils.el 
b/tests/test-casual-editkit-utils.el
index b16efd771e..c2e9605f66 100644
--- a/tests/test-casual-editkit-utils.el
+++ b/tests/test-casual-editkit-utils.el
@@ -676,10 +676,13 @@
   ;; TODO: need to test for region.
   (let ((tmpfile "casual-editkit-narrow-tmenu.el"))
     (casualt-editkit-setup tmpfile)
-    (cl-letf ((casualt-mock #'narrow-to-defun))
+    (cl-letf ((casualt-mock #'narrow-to-defun)
+              (casualt-mock #'narrow-to-page))
       (let ((test-vectors
-             '((:binding "d" :command narrow-to-defun))))
-
+             '((:binding "d" :command narrow-to-defun)
+               (:binding "p" :command narrow-to-page))))
+        (put 'narrow-to-page 'disabled nil)
+        (put 'narrow-to-region 'disabled nil)
         (emacs-lisp-mode)
         (insert "(defun foo() (message \"hi.\"))")
         (goto-char (point-min))

Reply via email to