From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Nov 2023 09:21:38 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5de5b7b418d1c1ae9c96709ea6f41a21ddc56c72;p=emacs.git

Merge from origin/emacs-29

d5e5ea4e36b Fix guessing commands for zstandard archives in Dired
90db29aff86 Fix eglot.texi (JSONRPC objects in Elisp) example
5ef48ad6a37 ; Fix one author's name.
c4e9a6159a3 * doc/man/emacsclient.1: Fix --tramp option.
6dca3a8eab2 Improve `nsm-protocol-check--3des-cipher` docstring
---

5de5b7b418d1c1ae9c96709ea6f41a21ddc56c72
diff --cc admin/authors.el
index 679ddf08085,266b52f4c90..2108f481a0c
--- a/admin/authors.el
+++ b/admin/authors.el
@@@ -78,10 -87,10 +78,10 @@@ files."
      ("David M. Koppelman" "David Koppelman")
      ("David M. Smith" "David Smith" "David M Smith")
      ("David O'Toole" "David T. O'Toole")
-     (nil "dalanicolai")
+     ("Daniel Laurens Nicolai" "dalanicolai")
      (nil "deech@deech")
      ("Deepak Goel" "D. Goel")
 -    ("Earl Hyatt" "Earl" "ej32u@protonmail\\.com")
 +    ("Earl Hyatt" "Earl" "ej32u@protonmail.com")
      ("Ed L. Cashin" "Ed L Cashin")
      ("Edward M. Reingold" "Ed\\(ward\\( M\\)?\\)? Reingold" "Reingold Edward M")
      ("Emilio C. Lopes" "Emilio Lopes")