From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Nov 2023 11:42:53 +0000 (-0500)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8726dd382a74737d19b958eaa037232fc9fb592;p=emacs.git

Merge from origin/emacs-29

77ab00207d6 ; * admin/authors.el (authors-aliases): Add Noah Peart.
6f843f03dc2 typescript-ts-mode: Add missing 'operator' to treesit-fon...
0676a029310 Extend D-Bus doc and test
df094dd4bc1 Do not unregister a D-Bus service which is a unique name
e6ad97a3338 Fix byte-compilation warnings about 'sqlite-rollback'
---

d8726dd382a74737d19b958eaa037232fc9fb592
diff --cc admin/authors.el
index 2108f481a0c,bbb7a928912..7fb616ac0b7
--- a/admin/authors.el
+++ b/admin/authors.el
@@@ -173,14 -195,20 +173,15 @@@ files."
      ("Michael R. Cook" "Michael Cook")
      ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
      ("Michalis V" "^mvar")
 -    ("Miha Rihtaršič" "Miha Rihtarsic" "miha@kamnitnik\\.top" "miha")
 +    ("Miha Rihtaršič" "Miha Rihtarsic")
      ("Mikio Nakajima" "Nakajima Mikio")
 -    (nil "montag451@laposte\\.net")
 -    (nil "na@aisrntairetnraoitn")
      ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
+     ("Noah Peart" "noah\\.v\\.peart@gmail\\.com")
      ("Noorul Islam" "Noorul Islam K M")
  ;;;    ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME?
 -    (nil "odanoburu@")
 -    (nil "one\\.last\\.kiss@outlook\\.com")
 -    ("Cao ZhenXiang" "mail@ookami\\.one")
      ("Óscar Fuentes" "Oscar Fuentes")
      (nil "pillule")
 -    (nil "psyberbits@gmail\\.com")
 +    (nil "psyberbits@gmail.com")
      ("Paul Eggert" "Paul R\\. Eggert")
      ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
      ("Pavel Kobiakov" "Pavel Kobyakov")