Merge from origin/emacs-29

755ae813a6a ; Declare some treesit.c functions in typescript-ts-mode.el.
89fa204b706 Fix loss of encrypted data in plstore.el
d9a1175a611 Close SQL database when corresponding 'sqlite-mode' buffe...
cbd8fac283a Fix Unicode normalization of characters
825be05b379 Support one-time passwords in Tramp
f880b94e649 Fix the 'C' and 'c' categories of characters
58fd212d8a2 Fix Emoji zooming commands
8970cdd009a ; Fix last change.
ba924be4522 ; * etc/DEBUG: Improve the redisplay section.
e110312ad95 ; * doc/lispref/minibuf.texi (Text from Minibuffer): Ment...
65f4810003b tsx-ts-mode--font-lock-compatibility-bb1f97b: Improve
6fe11b88ed0 Avoid using --display in emacsclient to reuse frames on PGTK
2fc7463c0e5 ; * INSTALL: Don't advertise -O3.  (Bug#65988)
29055412f2d ; Fix doc string of 'lsh'
738d8543337 Support emacsclient on Windows with server on GNU or Unix...
f0a89fa1d0e ; * lisp/saveplace.el (save-place-ignore-files-regexp): F...
c9cb8ee0fc0 Fix defcustom in saveplace.el (Bug#65977)
5ec8be1d589 ; * lisp/subr.el (string-suffix-p, string-prefix-p): Doc ...
809305e6d8f Fix 'window-text-pixel-size' when there are several image...
ea14b0dcc20 : Doc fix.
01e8a0c6cbf Doc fix for prettify-symbols-unprettify-at-point
0065621d0d3 (report_overlay_modification): Fix bug#65929
6cc6455e931 Fix SVG colors (bug#56182)
9396d73942e * doc/emacs/text.texi (Outline Minor Mode): Add a note ab...
a65d1a5a167 Improve documentation of 'list-abbrevs'
5dcc4b7eab1 Tweak s-p-f for js-ts-mode
1fb2fb501f3 typescript-ts-mode, tsx-ts-mode: Fix syntax properties fo...
946b395e7e1 * lisp/progmodes/c-ts-mode.el (c++-ts-mode): Provide (bug...
33ee3e588fd Fix regression of treesit_cursor_helper_1
d11d81dfcc6 ; Fix doc typos (Bug#65868)
6554ec22465 Update docs for passing of Thien-Thi Nguyen
5ab2792d5c1 Update defvar usage tips example in manual
35d88c657e1 Document using Flymake together with Eglot
3f04efe9e7d ; * src/font.h (struct font): Comment about use of averag...
459b5f6b6d1 ; * admin/authors.el (authors-aliases): Update.
0c029ae8bcb ; tweak etc/TODO item

# Conflicts:
#	admin/authors.el
#	lisp/subr.el

10 files changed, 50 insertions, 22 deletions

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 3678377e9b5..6c171d47427 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -275,6 +275,8 @@ Edit a list of abbrevs; you can add, alter or remove definitions.
 
 @example
 @var{various other tables@dots{}}
+(python-mode-skeleton-abbrev-table)
+"class" (sys)       0 "" python-skeleton-class
 (lisp-mode-abbrev-table)
 "ks"          0    "keymap-set"
 (global-abbrev-table)
@@ -297,11 +299,14 @@ keeps track of this to help you see which abbrevs you actually use, so
 that you can eliminate those that you don't use often.  The string at
 the end of the line is the expansion.
 
-  Some abbrevs are marked with @samp{(sys)}.  These @dfn{system abbrevs}
-(@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual}) are
-pre-defined by various modes, and are not saved to your abbrev file.
-To disable a system abbrev, define an abbrev of the same name that
-expands to itself, and save it to your abbrev file.
+  Some abbrevs are marked with @samp{(sys)}.  These @dfn{system
+abbrevs} (@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual})
+are pre-defined by various modes, and are not saved to your abbrev
+file.  To disable a system abbrev, define an abbrev of the same name
+that expands to itself, and save it to your abbrev file.  The system
+abbrevs have an associated hook function, which is called to perform
+the abbrev expansion; the name of that function follows the abbrev
+expansion in the buffer shown by @code{list-abbrevs}.
 
 @findex edit-abbrevs
 @kindex C-c C-c @r{(Edit Abbrevs)}
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index b21d1e766ef..483ea3306a3 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -906,6 +906,11 @@ Thomas Neumann and Eric S. Raymond wrote @file{make-mode.el},
 a mode for editing makefiles.
 
 @item
+Thien-Thi Nguyen wrote the @samp{xpm}, @samp{gnugo}, and
+@samp{ascii-art-to-unicode} packages.  He also made substantial
+contributions to many others, such as @file{vc.el}.
+
+@item
 Thien-Thi Nguyen and Dan Nicolaescu wrote @file{hideshow.el}, a minor
 mode for selectively displaying blocks of text.
 
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 456e2087217..23dcc44a928 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -626,7 +626,7 @@ button.
 the theme file and asks if you really want to load it.  Because
 loading a Custom theme can execute arbitrary Lisp code, you should
 only say yes if you know that the theme is safe; in that case, Emacs
-offers to remember in the future that the theme is safe(this is done
+offers to remember in the future that the theme is safe (this is done
 by saving the theme file's SHA-256 hash to the variable
 @code{custom-safe-themes}; if you want to treat all themes as safe,
 change its value to @code{t}).  Themes that come with Emacs (in the
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 3d3f2562617..6f57bae8fef 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1024,10 +1024,11 @@ addition to ellipsis, to show that a section is hidden.  Clicking the
 mouse on the button toggles display of the section.  If the value of
 this variable is @code{insert}, the buttons are inserted directly into
 the buffer text, so @key{RET} on the button will also toggle display
-of the section, like a mouse click does.  If the value is
-@code{in-margins}, Outline minor mode will use the window margins to
-indicate that a section is hidden.  The buttons are customizable as icons
-(@pxref{Icons}).
+of the section, like a mouse click does.  Using the value @code{insert}
+is not recommended in editable buffers because it modifies them.
+If the value is @code{in-margins}, Outline minor mode will use the
+window margins to indicate that a section is hidden.  The buttons are
+customizable as icons (@pxref{Icons}).
 
 @vindex outline-minor-mode-cycle
   If the @code{outline-minor-mode-cycle} user option is
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 0057979778f..5a824649d42 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -422,7 +422,7 @@ execution of the compiled file.  For example,
 @lisp
 (eval-when-compile
   (unless (fboundp 'some-new-thing)
-    (defmacro 'some-new-thing ()
+    (defmacro some-new-thing ()
       (compatibility code))))
 @end lisp
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 99bc10677cd..d4b1c4f2b3e 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -90,7 +90,7 @@ Manual}.
 (kbd "C-x C-f") @result{} "\C-x\C-f"
 (kbd "C-x 4 C-f") @result{} "\C-x4\C-f"
 (kbd "X") @result{} "X"
-(kbd "RET") @result{} "\^M"
+(kbd "RET") @result{} "^M"
 (kbd "C-c SPC") @result{} "\C-c@ "
 (kbd "<f1> SPC") @result{} [f1 32]
 (kbd "C-M-<down>") @result{} [C-M-down]
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 6cdfe1bd1cb..be4d7e37261 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -374,6 +374,7 @@ key, so the text properties are only preserved on the last three
 characters.
 @end defvar
 
+@vindex minibuffer-mode-map
 @defvar minibuffer-local-map
 This
 @anchor{Definition of minibuffer-local-map}
@@ -414,6 +415,9 @@ default, it makes the following bindings:
 @code{file-cache-minibuffer-complete}
 @end ignore
 @end table
+
+@noindent
+The variable @code{minibuffer-mode-map} is an alias for this variable.
 @end defvar
 
 @defun read-no-blanks-input prompt &optional initial inherit-input-method
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 93930d17587..404726e1f92 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -678,15 +678,15 @@ which are being phased out.)
 it as safe or risky; see @ref{File Local Variables}.
 
   When defining and initializing a variable that holds a complicated
-value (such as a keymap with bindings in it), it's best to put the
+value (such as a syntax table for a major mode), it's best to put the
 entire computation of the value into the @code{defvar}, like this:
 
 @example
-(defvar my-mode-map
-  (let ((map (make-sparse-keymap)))
-    (keymap-set map "C-c C-a" 'my-command)
+(defvar my-major-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?# "<" table)
     @dots{}
-    map)
+    table)
   @var{docstring})
 @end example
 
@@ -696,9 +696,9 @@ loading the file, the variable is either still uninitialized or
 initialized properly, never in-between.  If it is still uninitialized,
 reloading the file will initialize it properly.  Second, reloading the
 file once the variable is initialized will not alter it; that is
-important if the user has run hooks to alter part of the contents
-(such as, to rebind keys).  Third, evaluating the @code{defvar} form
-with @kbd{C-M-x} will reinitialize the map completely.
+important if the user has changed its value.  Third, evaluating the
+@code{defvar} form with @kbd{C-M-x} will reinitialize the variable
+completely.
 
 @node Accessing Variables
 @section Accessing Variable Values
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 237f0702778..e68692afb10 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -59,8 +59,11 @@ types of diagnostics.
 
 To learn about using Flymake, @pxref{Using Flymake}.
 
-Flymake is designed to be easily extended to support new backends via
-an Elisp interface.  @xref{Extending Flymake}.
+When the Emacs LSP support mode Eglot is enabled, Flymake will use
+that as an additional back-end.  @xref{Eglot Features,,, eglot, Eglot:
+The Emacs LSP Client}  Flymake is also designed to be easily extended
+to support new backends via an Elisp interface.  @xref{Extending
+Flymake}.
 
 Historically, Flymake used to accept diagnostics from a single
 backend.  Although obsolete, it is still functional.  To learn how to
@@ -93,6 +96,10 @@ already setup this hook for you, by adding @dfn{backend functions} to
 @code{flymake-diagnostic-functions}.  If you know Elisp you may also
 write your own Flymake backend functions.  @xref{Backend functions}.
 
+When the Emacs LSP support mode Eglot is enabled, Flymake will use
+that as an additional back-end automatically.  @xref{Eglot Features,,,
+eglot, Eglot: The Emacs LSP Client}
+
 @menu
 * Starting Flymake::
 * Finding diagnostics::
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index ea3bf8570b7..56d5fcd4bf0 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2436,8 +2436,10 @@ which may not be the same as the local login shell prompt,
 @value{tramp} sets a similar default value for both prompts.
 
 @item @code{tramp-password-prompt-regexp}
+@item @code{tramp-otp-password-prompt-regexp}
 @item @code{tramp-wrong-passwd-regexp}
 @vindex tramp-password-prompt-regexp
+@vindex tramp-otp-password-prompt-regexp
 @vindex tramp-wrong-passwd-regexp
 
 @value{tramp} uses @code{tramp-password-prompt-regexp} to
@@ -2471,6 +2473,10 @@ This user option is, by default, initialized from
 is usually more convenient to add new passphrases to that user option
 instead of altering this user option.
 
+The user option @code{tramp-otp-password-prompt-regexp} has a similar
+purpose, but for one-time passwords.  Those passwords are not cached
+by @value{tramp} for reuse.
+
 Similar localization may be necessary for handling wrong password
 prompts, for which @value{tramp} uses @code{tramp-wrong-passwd-regexp}.