branch: elpa/casual
commit b7503bd0293a50572d474b84ce7e24b2bf0ffc7b
Author: Charles Choi <[email protected]>
Commit: Charles Choi <[email protected]>

    Convert over to using transient-define-group
    
    - Migrate away from defconst to using transient-define-group.
---
 lisp/Makefile-calc.make           | 13 ++++++++++++-
 lisp/Makefile-calendar.make       |  7 +++++++
 lisp/casual-agenda-utils.el       | 13 ++++++-------
 lisp/casual-calc-utils.el         |  8 ++++----
 lisp/casual-calendar-constants.el | 14 ++++++--------
 lisp/casual-editkit-constants.el  | 12 ++++++------
 6 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/lisp/Makefile-calc.make b/lisp/Makefile-calc.make
index bf6be3608f..2021e916e4 100644
--- a/lisp/Makefile-calc.make
+++ b/lisp/Makefile-calc.make
@@ -48,6 +48,17 @@ casual-calc-symbolic.el
 
 ELISP_TEST_INCLUDES=casual-calc-test-utils.el
 
-PACKAGE_PATHS=-L $(CASUAL_LIB_LISP_DIR)
+PACKAGE_PATHS=                                 \
+-L $(EMACS_ELPA_DIR)/compat-current            \
+-L $(EMACS_ELPA_DIR)/seq-current               \
+-L $(EMACS_ELPA_DIR)/transpose-frame-current   \
+-L $(EMACS_ELPA_DIR)/transient-current         \
+-L $(EMACS_ELPA_DIR)/magit-current             \
+-L $(EMACS_ELPA_DIR)/magit-section-current     \
+-L $(EMACS_ELPA_DIR)/dash-current              \
+-L $(EMACS_ELPA_DIR)/with-editor-current       \
+-L $(EMACS_ELPA_DIR)/symbol-overlay-current    \
+-L $(CASUAL_LIB_LISP_DIR)
+
 
 include Makefile--rules.make
diff --git a/lisp/Makefile-calendar.make b/lisp/Makefile-calendar.make
index 88a07a2eec..01caf35f33 100644
--- a/lisp/Makefile-calendar.make
+++ b/lisp/Makefile-calendar.make
@@ -25,7 +25,14 @@ ELISP_TEST_INCLUDES=casual-calendar-test-utils.el
 PACKAGE_PATHS=                                 \
 -L $(EMACS_ELPA_DIR)/compat-current            \
 -L $(EMACS_ELPA_DIR)/seq-current               \
+-L $(EMACS_ELPA_DIR)/transpose-frame-current   \
 -L $(EMACS_ELPA_DIR)/transient-current         \
+-L $(EMACS_ELPA_DIR)/magit-current             \
+-L $(EMACS_ELPA_DIR)/magit-section-current     \
+-L $(EMACS_ELPA_DIR)/dash-current              \
+-L $(EMACS_ELPA_DIR)/with-editor-current       \
+-L $(EMACS_ELPA_DIR)/symbol-overlay-current    \
 -L $(CASUAL_LIB_LISP_DIR)
 
+
 include Makefile--rules.make
diff --git a/lisp/casual-agenda-utils.el b/lisp/casual-agenda-utils.el
index c9772a84cb..8f5e6ec2d7 100644
--- a/lisp/casual-agenda-utils.el
+++ b/lisp/casual-agenda-utils.el
@@ -55,16 +55,17 @@ is non-nil, then the Unicode symbol is returned, otherwise a
 plain ASCII-range string."
   (casual-lib-unicode-db-get key casual-agenda-unicode-db))
 
-(defconst casual-agenda-navigation-group
+;; Casual Agenda menu navigation group.
+(transient-define-group casual-agenda-navigation-group
   [:class transient-row
    (casual-lib-quit-one)
    ("RET" "Open" org-agenda-switch-to)
    ("." "Now" casual-agenda-goto-now :transient t)
    ("C-/" "Undo" org-agenda-undo :transient t)
-   (casual-lib-quit-all)]
-  "Casual Agenda menu navigation group.")
+   (casual-lib-quit-all)])
 
-(defconst casual-agenda-agenda-navigation-group
+;; Casual Agenda navigation group within an Agenda.
+(transient-define-group casual-agenda-agenda-navigation-group
   ["Navigation"
     ["Line"
      ("p" "↑" org-agenda-previous-line
@@ -117,9 +118,7 @@ plain ASCII-range string."
      ("M-j" "šŸš€ ā°" org-agenda-clock-goto
       :inapt-if-not org-clocking-p
       :description (lambda () (format "%s…" (casual-agenda-unicode-get 
:jumpclocked)))
-      :transient t)]]
-  "Casual Agenda navigation group within an Agenda.")
-
+      :transient t)]])
 
 (defun casual-agenda-goto-now ()
   "Redo agenda view and move point to current time \"now\"."
diff --git a/lisp/casual-calc-utils.el b/lisp/casual-calc-utils.el
index 89a76a14e8..4eef9ff4c3 100644
--- a/lisp/casual-calc-utils.el
+++ b/lisp/casual-calc-utils.el
@@ -122,7 +122,7 @@ Invokes command `calc-roll-down'."
   (interactive)
   (call-interactively #'calc-roll-down))
 
-(defconst casual-calc-operators-group
+(transient-define-group casual-calc-operators-group
   ["Operators"
     ("+" "add" casual-calc--plus :transient t)
     ("-" "sub" casual-calc--minus :transient t)
@@ -130,7 +130,7 @@ Invokes command `calc-roll-down'."
     ("/" "div" casual-calc--divide :transient t)
     ("%" "mod" casual-calc--mod :transient t)])
 
-(defconst casual-calc-operators-group-row
+(transient-define-group casual-calc-operators-group-row
   ["Operators"
    :class transient-row
     ("+" "add" casual-calc--plus :transient t)
@@ -139,14 +139,14 @@ Invokes command `calc-roll-down'."
     ("/" "div" casual-calc--divide :transient t)
     ("%" "mod" casual-calc--mod :transient t)])
 
-(defconst casual-calc-basic-operators-group
+(transient-define-group casual-calc-basic-operators-group
   ["Operators"
     ("+" "add" casual-calc--plus :transient t)
     ("-" "sub" casual-calc--minus :transient t)
     ("*" "mul" casual-calc--times :transient t)
     ("/" "div" casual-calc--divide :transient t)])
 
-(defconst casual-calc-navigation-group
+(transient-define-group casual-calc-navigation-group
   [:class transient-row
           (casual-lib-quit-one)
           (casual-calc-algebraic-entry)
diff --git a/lisp/casual-calendar-constants.el 
b/lisp/casual-calendar-constants.el
index e7f532c1f3..5463519286 100644
--- a/lisp/casual-calendar-constants.el
+++ b/lisp/casual-calendar-constants.el
@@ -57,8 +57,8 @@ is non-nil, then the Unicode symbol is returned, otherwise a
 plain ASCII-range string."
   (casual-lib-unicode-db-get key casual-calendar-unicode-db))
 
-
-(defconst casual-calendar--navigation-group
+;; Transient navigation group for calendar.
+(transient-define-group casual-calendar--navigation-group
   ["Navigation"
    ["Day"
     ("b" "Behind" calendar-backward-day
@@ -137,16 +137,14 @@ plain ASCII-range string."
      :transient t)
     ("C-l" "Redraw" calendar-redraw
      :description (lambda () (casual-calendar-unicode-get :redraw))
-     :transient t)]]
-  "Transient navigation group for calendar.")
-
+     :transient t)]])
 
-(defconst casual-calendar--menu-navigation-group
+;; Transient menu navigation group for calendar.
+(transient-define-group casual-calendar--menu-navigation-group
   [:class transient-row
    (casual-lib-quit-one)
    ("RET" "Dismiss" transient-quit-all)
-   (casual-lib-quit-all)]
-  "Transient menu navigation group for calendar.")
+   (casual-lib-quit-all)])
 
 (provide 'casual-calendar-constants)
 ;;; casual-calendar-constants.el ends here
diff --git a/lisp/casual-editkit-constants.el b/lisp/casual-editkit-constants.el
index cdd96f9b3d..eb5a663d4b 100644
--- a/lisp/casual-editkit-constants.el
+++ b/lisp/casual-editkit-constants.el
@@ -57,21 +57,21 @@ is non-nil, then the Unicode symbol is returned, otherwise a
 plain ASCII-range string."
   (casual-lib-unicode-db-get key casual-editkit-unicode-db))
 
-(defconst casual-editkit-navigation-group
+;; Transient navigation group for Casual EditKit menus.
+(transient-define-group casual-editkit-navigation-group
   [:class transient-row
    (casual-lib-quit-one)
    ("U" "Undo" undo :transient t)
-   (casual-lib-quit-all)]
-  "Transient navigation group for Casual EditKit menus.")
+   (casual-lib-quit-all)])
 
-(defconst casual-editkit-cursor-navigation-group
+;; Transient cursor navigation group for Casual EditKit menus.
+(transient-define-group casual-editkit-cursor-navigation-group
   ["Cursor"
    :class transient-row
    ("<left>" "←" backward-char :transient t)
    ("<right>" "→" forward-char :transient t)
    ("<up>" "↑" previous-line :transient t)
-   ("<down>" "↓" next-line :transient t)]
-  "Transient cursor navigation group for Casual EditKit menus.")
+   ("<down>" "↓" next-line :transient t)])
 
 (provide 'casual-editkit-constants)
 ;;; casual-editkit-constants.el ends here

Reply via email to