some updates in light of new C-x w prefix map in Emacs 29

1 files changed, 6 insertions, 16 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c18d0724..4d32ea7a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1436,7 +1436,8 @@ state, attempt to produce some useful side window(s)."
 		    (let ((default-directory (expand-file-name "~/")))
 		      (slime))))
 		 (t (error "No side windows state & no heuristic")))))))
-(global-set-key "\C-cs" #'spw/window-toggle-side-windows)
+(global-set-key [remap window-toggle-side-windows]
+		#'spw/window-toggle-side-windows)
 
 (defun spw/delete-other-windows--toggle-side-windows
     (&optional window &rest _ignore)
@@ -2036,7 +2037,7 @@ Useful after resizing the frame."
           (set-window-buffer (next-window) next-win-buffer)
           (select-window first-win)
           (when this-win-2nd (other-window 1))))))
-(global-set-key "\C-cft" #'spw/toggle-frame-split)
+(global-set-key "\C-cwt" #'spw/toggle-frame-split)
 
 ;; orig http://blog.gleitzman.com/post/35416335505/hunting-for-unicode-in-emacs
 (defun spw/unicode-hunt ()
@@ -2089,17 +2090,6 @@ Useful after resizing the frame."
 			   (interactive)
 			   (spw/myrepos-global-action "sync")))
 
-;; Note there is C-x 5 2 to get the buffer in a new frame without disturbing
-;; existing window layout.
-(defun spw/window-to-frame ()
-  "Like `tear-off-window' but to be invoked from the keyboard."
-  (interactive)
-  (let ((buffer (current-buffer))
-	(display-buffer-overriding-action '(display-buffer-pop-up-frame)))
-    (delete-window)
-    (display-buffer buffer)))
-(global-set-key "\C-cff" #'spw/window-to-frame)
-
 ;; There are many variations on this online.  This one by Robert Bost, based
 ;; on work by Steve Yegge, Colin Doering and others
 (defun spw/rotate-windows (arg)
@@ -2122,7 +2112,7 @@ Useful after resizing the frame."
                  (p2 (window-point w2)))
             (set-window-buffer-start-and-point w1 b2 s2 p2)
             (set-window-buffer-start-and-point w2 b1 s1 p1)))))))
-(global-set-key "\C-cfr" #'spw/rotate-windows)
+(global-set-key "\C-cwr" #'spw/rotate-windows)
 
 ;; some influence here from Michael Stapelberg's config -- we both had a
 ;; function to do this, I discovered
@@ -2259,8 +2249,8 @@ Used in my `message-mode' yasnippets."
 ;; web page; and/or (ii) we want to be reminded to come back to (a particular
 ;; point in) the buffer by giving it its own frame or tab, in a way that's
 ;; lightweight and doesn't involve adding TODO entries
-(global-set-key "\C-cfs" #'spw/save-buffer-for-later)
-(global-set-key "\C-cns" #'spw/save-buffer-for-later)
+(global-set-key "\C-cws" #'spw/save-buffer-for-later)
+;; (global-set-key "\C-cns" #'spw/save-buffer-for-later)
 
 ;; Finally, this is for when we just want to protect the buffer contents from
 ;; being overwritten and nothing more