Merge from origin/emacs-30

67903f5 Restore the old behavior of `bookmark-write-file'
062da70 ; Improve prompts and error messages in 'info-look'
52dc01f ; * admin/admin.el (set-version): Note about Android.
fb282da Avoid double spaces around abbrevations in Texinfo
bc1ab8a ; * doc/emacs/custom.texi (Init Rebinding): Fix spacing.
b41ef43 ; Fix previous change
5638b1d Ispell: Use "personal dictionary" terminology consistently
cc791e7 ; Check man pages for mistakes less frequently
4ed4792 ; * admin/release-process: Minor copy-edits.
4a867c8 Add language server "ruff server" for Python
9e687c2 Fix go-ts-mode type declaration indentation (Bug#75785)
f751b3a ; Minor improvements for doc strings in map.el
cda78ed ; Fix typos
ce50a1d ; * src/w32.c (w32_memory_info): Fix coding style of last...
58d3d48 Fix bug in w32_memory_info
7738641 Avoid crashes in redisplay due to problematic font setups
0e3687e Improve 'key-valid-p' docstring
9878092 Minor copyedits in internals.texi
4726900 Better document side-effect free and pure C functions
04c475a ; Fix documentation about faces of tool-tip text

# Conflicts:
#	admin/codespell/codespell.exclude

Author: Eli-Zaretskii

ChangeLog.3

@@ -47356,7 +47356,7 @@
 	possible bug.
 
 	* lisp/progmodes/flymake.el (flymake--mode-line-counter): Must
-	explicily create a new string unpropertized string
+	explicitly create a new string unpropertized string
 
 2020-12-31  João Távora  <[email protected]>
 
@@ -160588,7 +160588,7 @@
 	to be replaced with an appropriate character reference.  Make
 	‘sgml-quote’ do that.
 
-	While at it, fix entiteis not being unquoted if they lack closing
+	While at it, fix entities not being unquoted if they lack closing
 	semicolon (e.g. ‘&amp’) occurring at the very end of a region.
 	Even though unlikely, make ‘sgml-quote’ handle this scenario.
 
@@ -186568,7 +186568,7 @@
 	Delete a Flymake obsolete alias that can't possibly work
 
 	The function `flymake-ler-make-ler' can't possibly work as an backward
-	compatible interface to existing extensinos (even purely hypothetical
+	compatible interface to existing extensions (even purely hypothetical
 	ones, since none are known).  This is because every diagnostic
 	considered by Flymake has to passed to a report-fn function.
 
@@ -223233,7 +223233,7 @@
 	called any longer.
 
 	Furthermore, when newline has whitespace syntax, ‘\s-$’ regular
-	expression ends up matching empty lins since ‘\s-’ matches newline
+	expression ends up matching empty lines since ‘\s-’ matches newline
 	characetr of proceeding line.  This leads to needless loop iterations.
 
 	Since previous change to ‘delete-trailing-whitespace’ already introduced

ChangeLog.4

@@ -342,7 +342,7 @@
 
 	Improve documentation for 'while-let'
 
-	* doc/lispref/control.texi (Conditionals): Reorganise describing
+	* doc/lispref/control.texi (Conditionals): Reorganize describing
 	what's overlapping between the macros (and between the macros
 	and let*), and then improve the documentation for 'while-let'.
 
@@ -15155,7 +15155,7 @@
 
 	Remove unnecessary (delq nil...).
 
-	This is presumed to be an artifacto of an old default.
+	This is presumed to be an artifact of an old default.
 
 	* lisp/which-key.el (which-key-replacement-alist):
 	Remove unnecessary (delq nil...).
@@ -50535,7 +50535,7 @@
 
 	The Emacs regexp engine interprets character ranges from ASCII to raw
 	bytes, such as [a-\xfe], as not including non-ASCII Unicode at all;
-	ranges from non-ACII Unicode to raw bytes, such as [ü-\x91], are
+	ranges from non-ASCII Unicode to raw bytes, such as [ü-\x91], are
 	ignored entirely.
 
 	To make rx produce a translation that works as intended, split ranges
@@ -53275,7 +53275,7 @@
 
 	* lisp/emacs-lisp/cl-macs.el (cl--slet): Add `nowarn` arg.
 	(cl--defsubst-expand): Use it.
-	(cl-defstruct): Silence warnings abour lexical shadowing when a slot's
+	(cl-defstruct): Silence warnings about lexical shadowing when a slot's
 	name happens to be the same as a dynbound var.
 
 2023-06-25  Stefan Monnier  <[email protected]>
@@ -68708,7 +68708,7 @@
 	works.
 
 	* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode):
-	Instead of re-using local variables through mutation, bind them at
+	Instead of reusing local variables through mutation, bind them at
 	point of use.  This ensures that there is no value leakage by mistake
 	and actually reduces the static size of the bytecode of this function
 	somewhat.
@@ -75501,7 +75501,7 @@
 	4004dde6ea Avoid positional arguments to define-minor-mode
 	cb85f9c274 Fix typo in use-package docstring
 	30b35d6d62 Update use-package.texi
-	9be2580f5f optimization: constand folding for read-kbd-macro
+	9be2580f5f optimization: constant folding for read-kbd-macro
 	1143f14d65 bind-keys-form: error for repeat sub-keywords without :rep...
 	c4bd2aa3b8 bind-key-form: allow :continue keyword inside repeat map
 	5ef327ce9f bind-key-form: allow :exit keyword inside repeat map

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))

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...

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

admin/nt/dist-build/build-dep-zips.py

@@ -30,7 +30,7 @@
 # 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-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 @@ def clean():
 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()

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}"
 

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

doc/emacs/custom.texi

@@ -2043,7 +2043,7 @@ sequences.  For example, to bind @kbd{C-c h} to the string
 @end example
 
   Non-@acronym{ASCII} characters can be specified directly in the
-string.  To bind to e.g. @samp{ol@'a}, use:
+string.  To bind to, for example, @samp{ol@'a}, use:
 
 @example
 (keymap-global-set "C-c h" (key-description "ol@'a"))

doc/emacs/dired.texi

@@ -749,7 +749,7 @@ window with a Dired buffer, or the most recently used window with
 a Dired buffer, or to use any other function.  When the value is
 a function, it will be called with no arguments and is expected to
 return a list of directories which will be used as defaults
-(i.e. default target and ``future history'').
+(i.e., default target and ``future history'').
 
   Here are the file-manipulating Dired commands that operate on files.