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

2 files changed, 3 insertions, 3 deletions

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index e0aa05f3826..4496b9c7968 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1600,7 +1600,7 @@ https://lists.gnu.org/r/emacs-devel/2016-07/msg00154.html.
 
 *** In Emacs built with GTK+ toolkit, menu-bar background becomes transparent.
 
-This happens when 'alpha-background' is less than 100.  This is due a
+This happens when 'alpha-background' is less than 100.  This is due to a
 GTK limitation, for which no workaround is currently known,
 unfortunately.
 
@@ -1622,7 +1622,7 @@ after switching back from another virtual desktop.  Setting the variable
 
 *** Gnome desktop does not respect frame size specified in .Xresources
 
-This has been obeserved when running a GTK+ build of Emacs 29 from the
+This has been observed when running a GTK+ build of Emacs 29 from the
 launch pad on Ubuntu 24.04 with mutter as window manager.  The problem
 can be resolved by running Emacs from the command line instead.
 
diff --git a/etc/future-bug b/etc/future-bug
index c18dd995d66..a9c871d6cee 100644
--- a/etc/future-bug
+++ b/etc/future-bug
@@ -30,7 +30,7 @@ comments when you write it (sometime in 2198 as I recall).
 
 
 P.S. You'll be pleased to know that since (time-forward N) still works
-     for N >= 0, we've used it to pre-emptively update configure.ac.
+     for N >= 0, we've used it to preemptively update configure.ac.
      Emacs now configures and builds on every platform that will ever
      be made.  It wasn't easy, but at least that's one problem out of
      the way for good.  If you'd like the patch, just ask.