Merge from origin/emacs-30

67903f5909d Restore the old behavior of `bookmark-write-file'
062da7003f9 ; Improve prompts and error messages in 'info-look'
52dc01f1c8b ; * admin/admin.el (set-version): Note about Android.
fb282da2a07 Avoid double spaces around abbrevations in Texinfo
bc1ab8ac3d8 ; * doc/emacs/custom.texi (Init Rebinding): Fix spacing.
b41ef43af19 ; Fix previous change
5638b1d6bd4 Ispell: Use "personal dictionary" terminology consistently
cc791e7499f ; Check man pages for mistakes less frequently
4ed4792e3b9 ; * admin/release-process: Minor copy-edits.
4a867c823b7 Add language server "ruff server" for Python
9e687c2871f Fix go-ts-mode type declaration indentation (Bug#75785)
f751b3afa4f ; Minor improvements for doc strings in map.el
cda78edc7d9 ; Fix typos
ce50a1d3c18 ; * src/w32.c (w32_memory_info): Fix coding style of last...
58d3d4820ad Fix bug in w32_memory_info
77386412050 Avoid crashes in redisplay due to problematic font setups
0e3687e6006 Improve 'key-valid-p' docstring
9878092d2b9 Minor copyedits in internals.texi
4726900fdc5 Better document side-effect free and pure C functions
04c475a39f2 ; Fix documentation about faces of tool-tip text

# Conflicts:
#	admin/codespell/codespell.exclude

6 files changed, 38 insertions, 21 deletions

diff --git a/admin/admin.el b/admin/admin.el
index a6a6aa76bb8..5cbf5ed3f5c 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -131,6 +131,11 @@ Root must be the root of an Emacs source tree."
       (set-version-in-file root "etc/refcards/ru-refcard.tex" newmajor
                            "\\\\newcommand{\\\\versionemacs}\\[0\\]\
 {\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")))
+  ;; Note: There's also the "android:versionCode=" property in
+  ;; java/AndroidManifest.xml, whose value is the major Emacs version,
+  ;; but if we increase it, upgraded installation will be unable to be
+  ;; downgraded to previous Emacs releases.  (The corresponding
+  ;; "android:versionName=" value there is updated by configure.)
   (let* ((oldversion
           (with-temp-buffer
             (insert-file-contents (expand-file-name "README" root))
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index f11918f53f3..5ebe467bcfe 100644
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1749,3 +1749,16 @@ All the characters whose Unicode general-category is Nd now have the
         (skipp (or (erc--memq-msg-prop 'erc--skip 'stamp)
     (when (and fullp culled (not skipp) (< 1 beg 3 end))
                 ((not skipp))
+        (elisp--safe-macroexpand-all): Make the warning more discrete.
+|PACK|UNPK|INDX|BLD |LEN |... |
+@key{INDX} removes an integer @var{n}, then builds a vector of
+integers from 1 to @var{n}.  @kbd{INV INDX} takes three numbers
+(sref STRING INDX) returns the character in STRING at INDEX.  INDEX
+;; |PACK|UNPK|INDX|BLD |LEN |... |
+       ( "INDX"  (progn calc-num-prefix calc-index) "\C-u\excalc-index\r" )
+       (calc-enter-result 3 "indx" (cons 'calcFunc-index (calc-top-list-n 3)))
+     (calc-enter-result 0 "indx" (list 'calcFunc-index
+        (elisp--safe-macroexpand-all): Make the warning more discreet.
+        dee6b36286 If use-package-verbose is t, show loading times when :afte...
+        267fc6d00c4 ruby-smie-rules: Fix misindentation of a method call afte...
+        b0181dafb9e Improve documentation of 'enable-local-variables' in Emac...
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 8e23165b257..858f381cb61 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -172,11 +172,6 @@ General steps (for each step, check for possible errors):
 4.    autoreconf -i -I m4 --force
       make bootstrap
 
-    The below script checks for any mistakes in the source text of
-    manual pages.  Fix any errors and re-run the script to verify.
-
-      ./admin/check-man-pages
-
     Then do this:
 
       make -C etc/refcards
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 567e8eb2133..af3036eb8e6 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -30,7 +30,7 @@ EMACS_MAJOR_VERSION= os.getenv('EMACS_MAJOR_VERSION') or "30"
 # Base URI for the package sources mapped in PKG_REQ
 SRC_REPO="https://repo.msys2.org/mingw/sources"
 
-# Map items in `dynamic-library-alist' to source pakages
+# Map items in `dynamic-library-alist' to source packages
 PKG_REQ='''mingw-w64-x86_64-giflib
 mingw-w64-x86_64-gnutls
 mingw-w64-x86_64-harfbuzz
@@ -47,7 +47,7 @@ mingw-w64-x86_64-xpm-nox
 mingw-w64-x86_64-tree-sitter
 mingw-w64-x86_64-sqlite3'''.split()
 
-# Emacs style path to dependancy DLLs on build system
+# Emacs style path to dependency DLLs on build system
 DLL_SRC="c:/msys64/mingw64/bin"
 
 # libraries we never include
@@ -110,7 +110,7 @@ def gather_deps():
     print("Deps updated in", os.getcwd(), "as", zipfile)
     os.chdir("../")
 
-# Return dependancies listed in Emacs
+# Return dependencies listed in Emacs
 def init_deps():
     return '''libXpm-nox4.dll
 libpng16-16.dll
@@ -382,7 +382,7 @@ parser.add_argument("-d", help="dry run",
 parser.add_argument("-l", help="list dependencies",
                     action="store_true")
 
-parser.add_argument("-e", help="extract direct dependancies",
+parser.add_argument("-e", help="extract direct dependencies",
                     action="store_true")
 
 args = parser.parse_args()
diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi
index b8226d69423..4a5de4f85f9 100644
--- a/admin/nt/dist-build/emacs.nsi
+++ b/admin/nt/dist-build/emacs.nsi
@@ -92,7 +92,7 @@ Section "Uninstall"
   # remove All Users shortcuts only
   # SetShellVarContext all
 
-  # retreive/recalculate uninstaller location
+  # retrieve/recalculate uninstaller location
   StrCpy $UninstallerPath "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe"
 
   # remove registry key
@@ -101,7 +101,7 @@ Section "Uninstall"
   # delete uninstaller
   Delete "$INSTDIR\Uninstall-${VERSION_BRANCH}.exe"
 
-  # retreive/reclculate startmenu shortcuts location
+  # retrieve/recalculate startmenu shortcuts location
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   StrCpy $StartMenuFolder "$SMPROGRAMS\$StartMenuFolder"
 
@@ -120,7 +120,7 @@ Section "Uninstall"
   # we're basically using GOTO, above, so we should get here..
   startMenuDeleteLoopDone:
 
-  # next we remove stuff from program-files/instalation path
+  # next we remove stuff from program-files/installation path
   # start with recursive delete of the Emacs we installed
   RMDir /r "$INSTDIR\emacs-${VERSION_BRANCH}"
 
diff --git a/admin/release-process b/admin/release-process
index d66bc48f70d..7240ff10a29 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -90,7 +90,8 @@ documentation (or decide no updates are necessary) for those that aren't.
 
 ** Try to reorder NEWS: most important things first, related items together.
 
-** For a major release, add a "New in Emacs XX" section to faq.texi.
+** For a major release, add a "New in Emacs XX" section to efaq.texi.
+This should highlight some of the more significant changes.
 
 ** cusver-check from admin.el can help find new defcustoms missing
 :version tags.  This asks for new and old Lisp directories; use the one
@@ -113,14 +114,14 @@ Check for node names using problematic characters:
 Sadly makeinfo does not warn about such characters.
 
 Check for major new features added since the last release (e.g. new
-lisp files), and add the relevant authors to the Acknowledgments in
+Lisp files), and add the relevant authors to the Acknowledgments in
 doc/emacs/ack.texi and emacs.texi.  To find new files, you could run a
 command such as this:
 
-  $ diff -rq emacs-NN.MM emacs-XX.YY | grep "^Only in emacs-XX"
+  $ git diff --name-status emacs-NN emacs-XX | grep -E "^A"
 
-where NN.MM is the previous Emacs version, and XX.YY is the new version.
-This assumes you have the source trees of both versions available.
+where emacs-NN is the previous Emacs release branch, and emacs-XX is the
+new one.
 
 For major releases, rewrite the "Antinews" appendix of the User Manual
 (doc/emacs/anti.texi) to describe features lost by downgrading to the
@@ -129,10 +130,6 @@ significant changes and new features in the upcoming release, then
 describe the "benefits" from losing those features.  Be funny, use
 humor.  The text written for the previous releases can serve as an example.
 
-The Emacs FAQ (doc/misc/efaq.texi) also has a "What's new" section;
-for major releases a new section should be added listing the
-significant changes.
-
 Check cross-references between the manuals (e.g. from emacs to elisp)
 are correct.  You can use something like the following in the info
 directory in the Emacs build tree:
@@ -225,6 +222,13 @@ https://publicsuffix.org/list/public_suffix_list.dat
 - leim/SKK-DIC/SKK-JISYO.L
 https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.L
 
+** Check for mistakes in man pages.
+
+The below script checks for any mistakes in the source text of
+manual pages.  Fix any errors and re-run the script to verify.
+
+  ./admin/check-man-pages
+
 * BUGS
 
 ** Check for modes which bind M-s that conflicts with a new global binding M-s