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

diff --cc INSTALL
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc admin/authors.el
index f1c988cc7761dd52218e6848c900cd3f60f82f5d,41ae67e34d9a407db01c3eaa4689364aee453991..679ddf080854ba23ea3325114cb6a47d1f591c53
--- 1/admin/authors.el
--- 2/admin/authors.el
+++ b/admin/authors.el
@@@ -90,15 -99,25 +90,19 @@@ files."
      ("Etienne Prud’Homme" "Etienne Prud'Homme")
      ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina")
      (nil "felix.*EmacsWiki")
+     (nil "felix\\.dick@web\\.de")
+     ("Felicián Németh" "Felician Nemeth")
      (nil "foudfou")
 -    ("Feraidoon Mehri"
 -     "NightMachinary"
 -     "rudiwillalwaysloveyou@gmail\\.com" "fifymehry@gmail\\.com")
      ("Francis Litterio" "Fran Litterio")
      ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
      ("François Pinard" "Francois Pinard")
      ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
      ("Frederic Pierresteguy" "Fred Pierresteguy")
      (nil "^FSF")
 -    (nil "galeo")
 -    ("Garid Zorigoo" "garid3000" "garidzorigoo@gmail\\.com")
      ("Gerd Möllmann" "Gerd Moellmann")
+     (nil "haqle314")
+     ("Grégoire Jadi" "Gregoire Jadi")
      ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth")
 -    (nil "hokomo@airmail\\.cc" "hokomo")
      ("Hrvoje Nikšić" "Hrvoje Niksic")
      ("Ian Dunn" "^Ian D\\>")
      ;; lisp/org/ChangeLog.1 2010-11-11.
@@@ -118,7 -139,10 +123,8 @@@
      ("Jérémie Courrèges-Anglas" "Jeremie Courreges-Anglas")
      ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
      ("Jérémy Compostella" "Jeremy Compostella")
 -    (nil "jgarte@" "jgart")
 -    (nil "jicksaw@pm\\.me" "jicksaw")
      ("Jimmy Aguilar Mena" "Ergus")
+     ("Jindřich Makovička" "Jindrich Makovicka")
      ("Johan Bockgård" "Johan Bockgard")
      ("John F. Carr" "John F Carr")
      ("John J Foerch" "John Foerch")
@@@ -140,8 -165,15 +146,12 @@@
      ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA" "K\\. Handa")
      ("Kevin Greiner" "Kevin J. Greiner")
      ("Kim F. Storm" "Kim Storm")
+     ("Kjartan Óli Ágústsson" "Kjartan Oli Agustsson")
+     ;; The dash is a kludge, so this contributor is not ignored.
+     ("kobarity-" "kobarity@gmail\\.com")
+     ("Koen van Greevenbroek" "realcomplex" "koenvg@posteo\\.net")
      ("Kyle Jones" "Kyle E. Jones")
      ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen")
 -    ("Laurence Warne" "lWarne" "laurencewarne@gmail\\.com")
 -    (nil "lensplaysgames@gmail\\.com")
 -    (nil "lorniu@gmail\\.com")
      (nil "LynX@bk.ru")
      (nil "lu4nx")
      ("Marcus G. Daniels" "Marcus Daniels")

diff --cc admin/notes/unicode
Simple merge

diff --cc doc/emacs/ack.texi
index b21d1e766ef7bc1e89c04566622351de428e2018,de9af96e289842ec70a606a4a1ab290d7b36ef9f..483ea3306a3e3fe5026856c11532bd391e1c8365
--- 1/doc/emacs/ack.texi
--- 2/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@@ -902,9 -902,14 +902,14 @@@ Takahashi Naoto co-wrote @file{quail.el
  @file{robin.el}, another input method.
  
  @item
 -Thomas Neumann and Eric Raymond wrote @file{make-mode.el},
 +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 --cc doc/emacs/custom.texi
Simple merge

diff --cc doc/emacs/text.texi
Simple merge

diff --cc doc/lispref/compile.texi
Simple merge

diff --cc doc/lispref/keymaps.texi
Simple merge

diff --cc doc/lispref/minibuf.texi
Simple merge

diff --cc doc/lispref/variables.texi
Simple merge

diff --cc doc/misc/flymake.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc etc/DEBUG
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc lisp/international/characters.el
Simple merge

diff --cc lisp/international/emoji.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/progmodes/c-ts-mode.el
Simple merge

diff --cc lisp/progmodes/js.el
Simple merge

diff --cc lisp/progmodes/prog-mode.el
Simple merge

diff --cc lisp/progmodes/typescript-ts-mode.el
Simple merge

diff --cc lisp/saveplace.el
Simple merge

diff --cc lisp/server.el
Simple merge

diff --cc lisp/subr.el
index 3fad9d36b3ee6c02614a0a2a9b26ee0dff2d44c3,d5c461346cbd0fc0a57150170dc51393d209f6e2..e88815fa58caebd97467347b7c3550b999f51e0d
--- 1/lisp/subr.el
--- 2/lisp/subr.el
+++ b/lisp/subr.el
@@@ -554,14 -507,14 +554,16 @@@ If COUNT is negative, shifting is actua
  In this case, if VALUE is a negative fixnum treat it as unsigned,
  i.e., subtract 2 * `most-negative-fixnum' from VALUE before shifting it.
  
- This function is provided for compatibility.  In new code, use `ash'
- instead."
+ Most uses of this function turn out to be mistakes.  We recommend
+ to use `ash' instead, unless COUNT could ever be negative, and
+ if, when COUNT is negative, your program really needs the special
+ treatment of negative COUNT provided by this function."
    (declare (compiler-macro
              (lambda (form)
 -              (macroexp-warn-and-return "avoid `lsh'; use `ash' instead"
 -                                        form '(suspicious lsh) t form))))
 +              (macroexp-warn-and-return
 +               (format-message "avoid `lsh'; use `ash' instead")
 +               form '(suspicious lsh) t form)))
 +           (side-effect-free t))
    (when (and (< value 0) (< count 0))
      (when (< value most-negative-fixnum)
        (signal 'args-out-of-range (list value count)))
@@@ -5697,20 -5496,24 +5699,24 @@@ See also `string-equal'.
    (eq t (compare-strings string1 0 nil string2 0 nil t)))
  
  (defun string-prefix-p (prefix string &optional ignore-case)
-   "Return non-nil if PREFIX is a prefix of STRING.
+   "Return non-nil if STRING begins with PREFIX.
+ PREFIX should be a string; the function returns non-nil if the
+ characters at the beginning of STRING compare equal with PREFIX.
  If IGNORE-CASE is non-nil, the comparison is done without paying attention
- to case differences."
+ to letter-case differences."
 -  (declare (pure t) (side-effect-free t))
 +  (declare (side-effect-free t))
    (let ((prefix-length (length prefix)))
      (if (> prefix-length (length string)) nil
        (eq t (compare-strings prefix 0 prefix-length string
                             0 prefix-length ignore-case)))))
  
  (defun string-suffix-p (suffix string  &optional ignore-case)
-   "Return non-nil if SUFFIX is a suffix of STRING.
+   "Return non-nil if STRING ends with SUFFIX.
+ SUFFIX should be a string; the function returns non-nil if the
+ characters at end of STRING compare equal with SUFFIX.
  If IGNORE-CASE is non-nil, the comparison is done without paying
- attention to case differences."
+ attention to letter-case differences."
 -  (declare (pure t) (side-effect-free t))
 +  (declare (side-effect-free t))
    (let ((start-pos (- (length string) (length suffix))))
      (and (>= start-pos 0)
           (eq t (compare-strings suffix nil nil

diff --cc src/buffer.c
Simple merge

diff --cc src/font.h
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/treesit.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc test/lisp/international/ucs-normalize-tests.el
Simple merge