From 09887a2d41f61dff749860fe41a5e8382bb03bd9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 9 Apr 2025 13:34:55 +0800 Subject: [PATCH] Rename some of the new window layout commands * lisp/window-x.el (rotate-window-layout-counterclockwise): Rename to window-layout-rotate-anticlockwise. (rotate-window-layout-clockwise): Rename to window-layout-rotate-clockwise. (flip-window-layout-horizontally): Rename to window-layout-flip-leftright. (flip-window-layout-vertically): Rename to window-layout-flip-topdown. (transpose-window-layout): Rename to window-layout-transpose. * doc/lispref/windows.texi (Changing Window Layouts): * etc/NEWS: * lisp/ldefs-boot.el (rotate-window-layout-counterclockwise) (rotate-window-layout-clockwise, flip-window-layout-horizontally) (flip-window-layout-vertically, transpose-window-layout): Update for the renames. --- doc/lispref/windows.texi | 12 ++++++------ etc/NEWS | 6 +++--- lisp/ldefs-boot.el | 10 +++++----- lisp/window-x.el | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 417c323be6b..3a8dffd1af1 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -2256,7 +2256,7 @@ unless stated otherwise. counterclockwise. @cindex rotate window layout -@deffn Command rotate-window-layout-clockwise &optional window +@deffn Command window-layout-rotate-clockwise &optional window This command rotates the window layout clockwise by 90 degrees. Imagine a layout with three live windows @var{A}, @var{B} and @var{C} as depicted on the left below. Then this command will produce the layout @@ -2276,8 +2276,8 @@ on the right. @end smallexample @end deffn -@deffn Command rotate-window-layout-counterclockwise &optional window -This is like @code{rotate-window-layout-clockwise} but rotates the +@deffn Command window-layout-rotate-anticlockwise &optional window +This is like @code{window-layout-rotate-clockwise} but rotates the layout in the opposite direction as demonstrated in the example below. @smallexample @@ -2298,7 +2298,7 @@ The next two commands @sc{flip} the window layout---rotate it around an imaginary horizontal or vertical axis. @cindex flip window layout -@deffn Command flip-window-layout-vertically &optional window +@deffn Command window-layout-flip-topdown &optional window This command flips windows such that windows on the bottom become windows on the top and vice-versa as in the example below. @@ -2316,7 +2316,7 @@ windows on the top and vice-versa as in the example below. @end smallexample @end deffn -@deffn Command flip-window-layout-horizontally &optional window +@deffn Command window-layout-flip-leftright &optional window This command rearranges window in a way that the windows on the right become the window on the left, and vice-versa. @@ -2338,7 +2338,7 @@ The next command can be used for @sc{transposing} windows---changing horizontal splits to vertical ones and vice-versa. @cindex transposing windows -@deffn Command transpose-window-layout &optional window +@deffn Command window-layout-transpose &optional window This command reorganizes windows such that every horizontal split becomes a vertical split and vice versa. diff --git a/etc/NEWS b/etc/NEWS index 71eada99ed8..8d66e4f6bdd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -227,9 +227,9 @@ albeit as a variable, not a user option. +++ *** New functions to modify window layout. Several functions to modify the window layout have been added: -'rotate-window-layout-clockwise', 'rotate-window-layout-anticlockwise', -'flip-window-layout-vertically', 'flip-window-layout-horizontally', -'transpose-window-layout', 'rotate-windows', and 'rotate-windows-back'. +'window-layout-rotate-clockwise', 'window-layout-rotate-anticlockwise', +'window-layout-flip-topdown', 'window-layout-flip-leftright', +'window-layout-transpose', 'rotate-windows', and 'rotate-windows-back'. +++ *** Windmove commands now move to skipped windows if invoked twice in a row. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index c1deb84754d..e1e203875f4 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -38064,7 +38064,7 @@ mode. ;;; Generated autoloads from window-x.el -(autoload 'rotate-window-layout-counterclockwise "window-x" "\ +(autoload 'window-layout-rotate-anticlockwise "window-x" "\ Rotate window layout of WINDOW counterclockwise by 90 degrees. If WINDOW is nil, it defaults to the root window of the selected frame. @@ -38073,7 +38073,7 @@ Interactively, a prefix argument says to rotate the parent window of the selected window. (fn &optional WINDOW)" t) -(autoload 'rotate-window-layout-clockwise "window-x" "\ +(autoload 'window-layout-rotate-clockwise "window-x" "\ Rotate window layout under WINDOW clockwise by 90 degrees. If WINDOW is nil, it defaults to the root window of the selected frame. @@ -38082,7 +38082,7 @@ Interactively, a prefix argument says to rotate the parent window of the selected window. (fn &optional WINDOW)" t) -(autoload 'flip-window-layout-horizontally "window-x" "\ +(autoload 'window-layout-flip-leftright "window-x" "\ Horizontally flip windows under WINDOW. Flip the window layout so that the window on the right becomes the @@ -38094,7 +38094,7 @@ Interactively, a prefix argument says to flip the parent window of the selected window. (fn &optional WINDOW)" t) -(autoload 'flip-window-layout-vertically "window-x" "\ +(autoload 'window-layout-flip-topdown "window-x" "\ Vertically flip windows under WINDOW. Flip the window layout so that the top window becomes the bottom window, @@ -38106,7 +38106,7 @@ Interactively, a prefix argument says to flip the parent window of the selected window. (fn &optional WINDOW)" t) -(autoload 'transpose-window-layout "window-x" "\ +(autoload 'window-layout-transpose "window-x" "\ Transpose windows under WINDOW. Reorganize the windows under WINDOW so that every horizontal split diff --git a/lisp/window-x.el b/lisp/window-x.el index ad34f67c9c0..37344e9101a 100644 --- a/lisp/window-x.el +++ b/lisp/window-x.el @@ -77,7 +77,7 @@ where HEIGHT and WIDTH are the normal height and width of the window. (if current-prefix-arg (window-parent) (window-main-window))) ;;;###autoload -(defun rotate-window-layout-counterclockwise (&optional window) +(defun window-layout-rotate-anticlockwise (&optional window) "Rotate window layout of WINDOW counterclockwise by 90 degrees. If WINDOW is nil, it defaults to the root window of the selected frame. @@ -88,7 +88,7 @@ selected window." (window--transpose window '(right . above) nil)) ;;;###autoload -(defun rotate-window-layout-clockwise (&optional window) +(defun window-layout-rotate-clockwise (&optional window) "Rotate window layout under WINDOW clockwise by 90 degrees. If WINDOW is nil, it defaults to the root window of the selected frame. @@ -99,7 +99,7 @@ selected window." (window--transpose window '(left . below) nil)) ;;;###autoload -(defun flip-window-layout-horizontally (&optional window) +(defun window-layout-flip-leftright (&optional window) "Horizontally flip windows under WINDOW. Flip the window layout so that the window on the right becomes the @@ -113,7 +113,7 @@ selected window." (window--transpose window '(below . left) t)) ;;;###autoload -(defun flip-window-layout-vertically (&optional window) +(defun window-layout-flip-topdown (&optional window) "Vertically flip windows under WINDOW. Flip the window layout so that the top window becomes the bottom window, @@ -127,7 +127,7 @@ selected window." (window--transpose window '(above . right) t)) ;;;###autoload -(defun transpose-window-layout (&optional window) +(defun window-layout-transpose (&optional window) "Transpose windows under WINDOW. Reorganize the windows under WINDOW so that every horizontal split