aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2024-01-13 20:40:35 +0200
committerEli Zaretskii2024-01-13 20:40:35 +0200
commitf149de223bf19a55cacf89cc6e2dcc915189cabc (patch)
tree1db5ff36e2740da65d07cb7df4ab00567de1c439
parent1f97a8787957e49f1893b9ac73c95228f6ac1a13 (diff)
parent51f391998b19a94d35d743952006afd71ad7f545 (diff)
downloademacs-f149de223bf19a55cacf89cc6e2dcc915189cabc.tar.gz
emacs-f149de223bf19a55cacf89cc6e2dcc915189cabc.zip
Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29
-rw-r--r--doc/emacs/buffers.texi3
-rw-r--r--doc/emacs/display.texi1
-rw-r--r--doc/emacs/files.texi1
-rw-r--r--doc/emacs/windows.texi2
-rw-r--r--doc/misc/info.texi1
5 files changed, 7 insertions, 1 deletions
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index c592eec555d..8542243dadf 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -262,12 +262,14 @@ non-@code{nil}. If you change the option @code{view-read-only} to a
262non-@code{nil} value, making the buffer read-only with @kbd{C-x C-q} 262non-@code{nil} value, making the buffer read-only with @kbd{C-x C-q}
263also enables View mode in the buffer (@pxref{View Mode}). 263also enables View mode in the buffer (@pxref{View Mode}).
264 264
265@kindex C-x x r
265@findex rename-buffer 266@findex rename-buffer
266 @kbd{C-x x r} (@code{rename-buffer} changes the name of the current 267 @kbd{C-x x r} (@code{rename-buffer} changes the name of the current
267buffer. You specify the new name as a minibuffer argument; there is 268buffer. You specify the new name as a minibuffer argument; there is
268no default. If you specify a name that is in use for some other 269no default. If you specify a name that is in use for some other
269buffer, an error happens and no renaming is done. 270buffer, an error happens and no renaming is done.
270 271
272@kindex C-x x u
271@findex rename-uniquely 273@findex rename-uniquely
272 @kbd{C-x x u} (@code{rename-uniquely}) renames the current buffer to 274 @kbd{C-x x u} (@code{rename-uniquely}) renames the current buffer to
273a similar name with a numeric suffix added to make it both different 275a similar name with a numeric suffix added to make it both different
@@ -282,6 +284,7 @@ buffers with particular names. (With some of these features, such as
282buffer before using the command again, otherwise it will reuse the 284buffer before using the command again, otherwise it will reuse the
283current buffer despite the name change.) 285current buffer despite the name change.)
284 286
287@kindex C-x x i
285 The commands @kbd{M-x append-to-buffer} and @kbd{C-x x i} 288 The commands @kbd{M-x append-to-buffer} and @kbd{C-x x i}
286(@code{insert-buffer}) can also be used to copy text from one buffer 289(@code{insert-buffer}) can also be used to copy text from one buffer
287to another. @xref{Accumulating Text}. 290to another. @xref{Accumulating Text}.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index e6a43bf74a8..6db9e8344c6 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1986,6 +1986,7 @@ the fringe indicates truncation at either end of the line. On text
1986terminals, this is indicated with @samp{$} signs in the rightmost 1986terminals, this is indicated with @samp{$} signs in the rightmost
1987and/or leftmost columns. 1987and/or leftmost columns.
1988 1988
1989@kindex C-x x t
1989@vindex truncate-lines 1990@vindex truncate-lines
1990@findex toggle-truncate-lines 1991@findex toggle-truncate-lines
1991 Horizontal scrolling automatically causes line truncation 1992 Horizontal scrolling automatically causes line truncation
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 44c58800197..36f72d42ba2 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1062,6 +1062,7 @@ revert it automatically if it has changed---provided the buffer itself
1062is not modified. (If you have edited the text, it would be wrong to 1062is not modified. (If you have edited the text, it would be wrong to
1063discard your changes.) 1063discard your changes.)
1064 1064
1065@kindex C-x x g
1065@vindex revert-buffer-quick-short-answers 1066@vindex revert-buffer-quick-short-answers
1066@findex revert-buffer-quick 1067@findex revert-buffer-quick
1067 The @kbd{C-x x g} keystroke is bound to the 1068 The @kbd{C-x x g} keystroke is bound to the
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index db3dea1d06e..302d3dcbf8c 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -287,7 +287,7 @@ Delete all windows in the selected frame except the selected window
287Delete the selected window and kill the buffer that was showing in it 287Delete the selected window and kill the buffer that was showing in it
288(@code{kill-buffer-and-window}). The last character in this key 288(@code{kill-buffer-and-window}). The last character in this key
289sequence is a zero. 289sequence is a zero.
290@item M-x delete-windows-on @key{RET} @var{buffer} @key{RET} 290@item C-x w 0 @key{RET} @var{buffer} @key{RET}
291Delete windows showing the specified @var{buffer}. 291Delete windows showing the specified @var{buffer}.
292@item C-x ^ 292@item C-x ^
293Make selected window taller (@code{enlarge-window}). 293Make selected window taller (@code{enlarge-window}).
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 31b314cb9a0..01c7f614e7d 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1148,6 +1148,7 @@ move between menu items.
1148@section @kbd{M-n} creates a new independent Info buffer in Emacs 1148@section @kbd{M-n} creates a new independent Info buffer in Emacs
1149 1149
1150@kindex M-n @r{(Info mode)} 1150@kindex M-n @r{(Info mode)}
1151@kindex C-x x n
1151@findex clone-buffer 1152@findex clone-buffer
1152@cindex multiple Info buffers 1153@cindex multiple Info buffers
1153 If you are reading Info in Emacs, you can select a new independent 1154 If you are reading Info in Emacs, you can select a new independent