Merge from origin/emacs-30

6dd8266bc4a ; * doc/emacs/custom.texi (Init File): Mention "M-x custo...
723cb4da47a ; Fix indexing in Emacs user manual

3 files changed, 22 insertions, 13 deletions

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 85b00567cf0..9b545b9fd0a 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2487,8 +2487,12 @@ as a function from Lisp programs.
 @c When updating this, also update ``Setting up a customization file''
 @c in efaq.texi.
   When Emacs is started, it normally tries to load a Lisp program from
-an @dfn{initialization file}, or @dfn{init file} for short.  This
-file, if it exists, specifies how to initialize Emacs for you.
+an @dfn{initialization file}, or @dfn{init file} for short.  This file,
+if it exists, specifies how to initialize Emacs for you and how to
+customize its various optional features.  The customizations you make by
+using @w{@kbd{M-x customize}} (@pxref{Easy Customization}) are also by
+default saved in the init file (@pxref{Saving Customizations}).
+
 Traditionally, file @file{~/.emacs} is used as the init file, although
 Emacs also looks at @file{~/.emacs.el}, @file{~/.emacs.d/init.el},
 @file{~/.config/emacs/init.el}, or other locations.  @xref{Find Init}.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index c2451e87715..22c326d33f5 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -469,15 +469,15 @@ frame is created on the current display terminal.
 buffer to select:
 
 @table @kbd
-@item C-x 5 2
 @kindex C-x 5 2
 @findex make-frame-command
+@item C-x 5 2
 Create a new frame using the default frame parameters
 (@code{make-frame-command}).
 
-@item C-x 5 c
 @kindex C-x 5 c
 @findex clone-frame
+@item C-x 5 c
 Create a new frame using the window configuration and frame parameters
 of the current frame (@code{clone-frame}).
 
@@ -503,18 +503,20 @@ Find the definition of an identifier in another frame.  This runs
 @code{xref-find-definitions-other-frame}, the multiple-frame variant
 of @kbd{M-.}.  @xref{Xref}.
 
-@item C-x 5 r @var{filename} @key{RET}
 @kindex C-x 5 r
 @findex find-file-read-only-other-frame
+@item C-x 5 r @var{filename} @key{RET}
 Visit file @var{filename} read-only, and select its buffer in another
 frame.  This runs @code{find-file-read-only-other-frame}.
 @xref{Visiting}.
 
+@kindex C-x 5 5
+@findex other-frame-prefix
 @item C-x 5 5
-A more general prefix command that affects the buffer displayed by the
-next command invoked immediately after this prefix command
-(@code{other-frame-prefix}).  It requests the buffer of the next
-command to be displayed in another frame.
+A more general prefix command that affects the buffer displayed by a
+subsequent command invoked after this prefix command
+(@code{other-frame-prefix}).  It requests the buffer to be displayed by
+a subsequent command to be shown in another frame.
 @end table
 
   You can control the appearance and behavior of the newly-created
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index d0ad1ee8547..9473f189c25 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -233,8 +233,8 @@ Select buffer @var{bufname} in another window
 (@code{switch-to-buffer-other-window}).  @xref{Select Buffer}.
 
 @findex display-buffer @r{(command)}
-@item C-x 4 C-o @var{bufname} @key{RET}
 @kindex C-x 4 C-o
+@item C-x 4 C-o @var{bufname} @key{RET}
 Display buffer @var{bufname} in some window, without trying to select
 it (@code{display-buffer}).  @xref{Displaying Buffers}, for details
 about how the window is chosen.
@@ -263,10 +263,13 @@ Find the definition of an identifier, similar to @kbd{M-.}
 Visit file @var{filename} read-only, and select its buffer in another
 window (@code{find-file-read-only-other-window}).  @xref{Visiting}.
 
+@kindex C-x 4 4
+@findex other-window-prefix
 @item C-x 4 4
-A more general prefix command affects the buffer displayed by the next
-command invoked immediately after this prefix command.  It requests
-the buffer of the next command to be displayed in another window.
+A more general prefix command affects the buffer displayed by a
+subsequent command invoked after this prefix command
+(@code{other-window-prefix}).  It requests the buffer displayed by a
+subsequent command to be shown in another window.
 
 @item C-x 4 1
 This general prefix command requests the buffer of the next command