Merge from origin/emacs-29

c62afb10cf0 Fix wallpaper-tests on MS-Windows
f2d212c6966 Fix a couple of eglot-tests
338b3718b6c Fix visiting RPM files
b4afee03193 Fix ff-quiet-mode doc
2445100d7d6 ; Improve documentation of 'match-buffers'
d4d0da96f0b ; Update make-tarball.txt for Emacs 29.
9b0bf694da4 ; Fix ldefs-boot.el.
0cb86a348c7 ; Update ChangeLog.4.

# Conflicts:
#	ChangeLog.4

1 files changed, 24 insertions, 8 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 232053e5e96..00516a0edd7 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -68,16 +68,25 @@ General steps (for each step, check for possible errors):
       PREFERRED_BRANCH = emacs-NN
 
     where NN is the version on the release branch from which you are
-    producing the tarball.  If NN is incorrect, update Makefile.in and
-    re-run 'configure' to update Makefile.
+    producing the tarball.  If NN is incorrect (which it usually is
+    when starting a pretest of a new major release), update
+    Makefile.in and re-run 'configure' to update Makefile.
 
-    If the versioned ChangeLog.N file is too large, start a new one
-    by bumping N, and also update the line in top-level Makefile.in
-    which says
+    For the first pretest of a new major release, consider starting a
+    new top-level ChangeLog.N file if the last versioned ChangeLog.N
+    file is too large.  A good point to start a new ChangeLog.N file
+    is when the last one gets larger than 1.5 MiB.  If so, start a new
+    one by bumping N, and also update the line in top-level
+    Makefile.in which says
 
       CHANGELOG_HISTORY_INDEX_MAX = N
 
     by incrementing the value of N by 1; then regenerate Makefile.
+    After bumping N, you need to actually create and commit
+    ChangeLog.N with the updated N, otherwise "M-x authors" below will
+    fail.  The easiest way of creating the new ChangeLog.N is to
+    rename the file ChangeLog (without the .N suffix) left over from
+    the last major release (it is usually unversioned) and commit it.
 
     Now:
 
@@ -99,11 +108,12 @@ General steps (for each step, check for possible errors):
     the relevant entry.  If a file was deleted or renamed, consider
     adding an appropriate entry to variables authors-ignored-files,
     authors-valid-file-names, or authors-renamed-files-alist in
-    authors.el.
+    authors.el.  If some authors are "ignored", consider adding
+    entries to the author-aliases variable.
 
     If necessary, repeat 'C-u M-x authors' after making those changes.
     Save the "*Authors*" buffer as etc/AUTHORS.
-    Check the diff looks reasonable.  Maybe add entries to
+    Check the diff looks reasonable.  Maybe add more entries to
     authors-ambiguous-files or authors-aliases, and repeat.
     Commit any fixes to authors.el.
 
@@ -169,7 +179,13 @@ General steps (for each step, check for possible errors):
     messages from TeX, but those seem to be harmless, as the result
     looks just fine.)
 
-5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
+5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.  After copying, edit
+    ldefs-boot.el to add
+
+    ;; no-byte-compile: t
+
+    to its file-local variables section, otherwise make-dist will
+    complain.
 
     Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files
     changed by M-x set-version.  Note that the set-version changes