transient-cycles: don't use private names for augmented commands

4 files changed, 9 insertions, 13 deletions

diff --git a/.config/i3/config b/.config/i3/config
index ec01697d..bc8d32f4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -62,7 +62,7 @@ mode "C-i-" {
 		       (display-buffer-overriding-action                       \
 		        '(display-buffer-same-window                           \
 			  . ((inhibit-same-window . nil)))))                   \
-		   (transient-cycles--spw/eshell-jump-from-here-with-transient-cycling))", \
+		   (transient-cycles-cmd-spw/eshell-jump-from-here))",         \
 		mode "default"
 
         # start a terminal emulator
diff --git a/.config/sway/config b/.config/sway/config
index 9b38ca31..74b88d74 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -47,7 +47,7 @@ mode "C-i-" {
 		       (display-buffer-overriding-action                       \
 		        '(display-buffer-same-window                           \
 			  . ((inhibit-same-window . nil)))))                   \
-		   (transient-cycles--spw/eshell-jump-from-here-with-transient-cycling))", \
+		   (transient-cycles-cmd-spw/eshell-jump-from-here))",         \
 		mode "default"
 
         # start a terminal emulator
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e794ba8d..af137e6c 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -952,10 +952,8 @@ keys (e.g. the use of the left and right arrow keys in
 ;; bit complicated but we want these commands to be easily repeatable but also
 ;; avoid setting a transient map containing self-insert chars, as might want
 ;; to type those right after switching.
-(define-key spw/arrow-keys-mode-map [down]
-    #'transient-cycles--next-buffer-with-transient-cycling)
-(define-key spw/arrow-keys-mode-map [up]
-    #'transient-cycles--previous-buffer-with-transient-cycling)
+(define-key spw/arrow-keys-mode-map [down] #'transient-cycles-cmd-next-buffer)
+(define-key spw/arrow-keys-mode-map [up] #'transient-cycles-cmd-previous-buffer)
 
 ;; Add bindings under C-c in addition to the arrow keys for use with terminals
 ;; that have no arrow keys.  'w' is for "window's buffers".
@@ -963,9 +961,9 @@ keys (e.g. the use of the left and right arrow keys in
 ;; Commented out atm because not much use as the subsequent transient cycling
 ;; uses the arrow keys!
 ;; (define-key transient-cycles-window-buffers-mode-map "\C-cb"
-;;   #'transient-cycles--next-buffer-with-transient-cycling)
+;;   #'transient-cycles-cmd-next-buffer)
 ;; (define-key transient-cycles-window-buffers-mode-map "\C-cw"
-;;   #'transient-cycles--previous-buffer-with-transient-cycling)
+;;   #'transient-cycles-cmd-previous-buffer)
 
 (define-key ctl-x-map "\C-@"
   #'transient-cycles-window-buffers-back-and-forth)
@@ -1008,8 +1006,7 @@ keys (e.g. the use of the left and right arrow keys in
       (transient-cycles-buffer-ring-cycler))
     ;; Bind into project-prefix-map, rather than just a remap, so that works
     ;; under C-x 4 p too.
-    (define-key project-prefix-map "e"
-      #'transient-cycles--project-eshell-with-transient-cycling)
+    (define-key project-prefix-map "e" #'transient-cycles-cmd-project-eshell)
     ;; Update project-switch-commands accordingly.
     (when (assoc 'project-eshell project-switch-commands)
       (setcar (assoc 'project-eshell project-switch-commands)
diff --git a/.emacs.d/site-lisp/transient-cycles.el b/.emacs.d/site-lisp/transient-cycles.el
index abb7888e..c4f512f0 100644
--- a/.emacs.d/site-lisp/transient-cycles.el
+++ b/.emacs.d/site-lisp/transient-cycles.el
@@ -179,9 +179,8 @@ argument to `set-transient-map'."
 					     (eq 'remap (aref original 0)))
 					(cons original (aref original 1)))
 				       (t original))
-	 for name = (intern
-		     (format "transient-cycles--%s-with-transient-cycling"
-			     (symbol-name original*)))
+	 for name
+	 = (intern (format "transient-cycles-cmd-%s" (symbol-name original*)))
 	 collect
 	 `(defun ,name ()
 	    ,(format "Like `%s', but augmented with transient cycling."