aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2025-10-18 12:26:28 +0300
committerEli Zaretskii2025-10-18 12:26:28 +0300
commit0d8a31423af692d608e9d59df489cf5a9a7e3753 (patch)
tree4471b375e85b25e3a457c682fc8bf510fcd62fef /src
parenta779f7e01bdd2afef52e7d4968a9a709019c8003 (diff)
downloademacs-0d8a31423af692d608e9d59df489cf5a9a7e3753.tar.gz
emacs-0d8a31423af692d608e9d59df489cf5a9a7e3753.zip
; Fix documentation of a recent commit
* src/window.c (Fcombine_windows, Funcombine_window): Doc fixes. * doc/lispref/windows.texi (Recombining Windows): Fix markup and wording.
Diffstat (limited to 'src')
-rw-r--r--src/window.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index f19f2041c77..d7348fb265b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5155,7 +5155,7 @@ windows with the same parent window. If neither FIRST has a previous
5155nor LAST has a next sibling, return that parent window. Otherwise, make 5155nor LAST has a next sibling, return that parent window. Otherwise, make
5156a new parent window whose first child window becomes FIRST and whose 5156a new parent window whose first child window becomes FIRST and whose
5157last child window becomes LAST, insert that parent window in the window 5157last child window becomes LAST, insert that parent window in the window
5158tree in lieu of the windows starting with FIRST and ending with LAST and 5158tree in lieu of the windows starting with FIRST and ending with LAST, and
5159return the new parent window. */) 5159return the new parent window. */)
5160 (Lisp_Object first, Lisp_Object last) 5160 (Lisp_Object first, Lisp_Object last)
5161{ 5161{
@@ -5280,9 +5280,9 @@ DEFUN ("uncombine-window", Funcombine_window, Suncombine_window, 1, 1, 0,
5280WINDOW should be an internal window whose parent window is an internal 5280WINDOW should be an internal window whose parent window is an internal
5281window of the same type. This means, that WINDOW and its parent should 5281window of the same type. This means, that WINDOW and its parent should
5282be either both horizontal or both vertical window combinations. If this 5282be either both horizontal or both vertical window combinations. If this
5283is the case, make the child windows of WINDOW child windows of WINDOW's 5283is the case, make the child windows of WINDOW become child windows of
5284parent and return t. Otherwise, leave the current configuration of 5284WINDOW's parent and return t. Otherwise, leave the current configuration
5285WINDOW's frame unchanged and return nil. */) 5285of WINDOW's frame unchanged and return nil. */)
5286 (Lisp_Object window) 5286 (Lisp_Object window)
5287{ 5287{
5288 struct window *w = decode_valid_window (window); 5288 struct window *w = decode_valid_window (window);