From 7d622045d083e77d41e0310290666049f81b7bdb Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Thu, 4 Jan 2024 12:51:20 +0200
Subject: [PATCH] emacs: use built-in command for next-multiframe-window

---
 .../prot-emacs-modules/prot-emacs-essentials.el        |  2 +-
 emacs/.emacs.d/prot-emacs.org                          | 10 +---------
 emacs/.emacs.d/prot-lisp/prot-simple.el                |  8 --------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-essentials.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-essentials.el
index 0a890250..3397f2f2 100644
--- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-essentials.el
+++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-essentials.el
@@ -102,7 +102,7 @@
     ;; Commands for paragraphs
     "M-Q" #'prot-simple-unfill-region-or-paragraph
     ;; Commands for windows and pages
-    "C-x O" #'prot-simple-other-windor-or-frame
+    "C-x O" #'next-multiframe-window
     "C-x n k" #'prot-simple-delete-page-delimiters
     "C-x M-r" #'prot-simple-swap-window-buffers
     ;; Commands for buffers
diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org
index 786a1a76..f7830d14 100644
--- a/emacs/.emacs.d/prot-emacs.org
+++ b/emacs/.emacs.d/prot-emacs.org
@@ -2478,7 +2478,7 @@ earlier ([[#h:713ede33-3802-40c6-a8e3-7e1fc0d0a924][The =prot-emacs-essentials.e
     ;; Commands for paragraphs
     "M-Q" #'prot-simple-unfill-region-or-paragraph
     ;; Commands for windows and pages
-    "C-x O" #'prot-simple-other-windor-or-frame
+    "C-x O" #'next-multiframe-window
     "C-x n k" #'prot-simple-delete-page-delimiters
     "C-x M-r" #'prot-simple-swap-window-buffers
     ;; Commands for buffers
@@ -14463,14 +14463,6 @@ Name the buffer after the defun's symbol."
 
 ;;;; Commands for buffers
 
-;;;###autoload
-(defun prot-simple-other-windor-or-frame ()
-  "Switch to other window or frame.
-If there is only one window, call `other-frame'.  Otherwise use
-`other-window'."
-  (interactive)
-  (call-interactively (if (one-window-p) #'other-frame #'other-window)))
-
 ;;;###autoload
 (defun prot-simple-kill-buffer (buffer)
   "Kill current BUFFER without confirmation.
diff --git a/emacs/.emacs.d/prot-lisp/prot-simple.el b/emacs/.emacs.d/prot-lisp/prot-simple.el
index c7fa8ca0..0be11e4e 100644
--- a/emacs/.emacs.d/prot-lisp/prot-simple.el
+++ b/emacs/.emacs.d/prot-lisp/prot-simple.el
@@ -674,14 +674,6 @@ Name the buffer after the defun's symbol."
 
 ;;;; Commands for buffers
 
-;;;###autoload
-(defun prot-simple-other-windor-or-frame ()
-  "Switch to other window or frame.
-If there is only one window, call `other-frame'.  Otherwise use
-`other-window'."
-  (interactive)
-  (call-interactively (if (one-window-p) #'other-frame #'other-window)))
-
 ;;;###autoload
 (defun prot-simple-kill-buffer (buffer)
   "Kill current BUFFER without confirmation.