From: Glenn Morris <rgm@gnu.org>
Date: Fri, 18 Dec 2020 16:55:06 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4664
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d2d8d7f53055d93ed2d8a435533c9a6a6303725;p=emacs.git

Merge from origin/emacs-27

48b9c47805 Minor fixes in authors.el and in tarball-making instructions
d7a4ceaa1e ; Add a new item to TODO
64fe805b19 Improve documentation of 'query-replace'
7cacf5da47 Update to Org 9.4.3

# Conflicts:
#	admin/authors.el
---

8d2d8d7f53055d93ed2d8a435533c9a6a6303725
diff --cc admin/authors.el
index cf9cf9871e5,f06b2129bfe..ced0e56810a
--- a/admin/authors.el
+++ b/admin/authors.el
@@@ -1123,10 -1125,11 +1130,13 @@@ in the repository."
      ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
      ("url-ns.el" . "lisp/obsolete/url-ns.el")
      ("gnus-news.texi" . "doc/misc/gnus.texi")
-     ("lisp/multifile.el". "lisp/fileloop.el")
-     ("lisp/emacs-lisp/thread.el". "lisp/thread.el")
+     ("lisp/multifile.el" . "lisp/fileloop.el")
+     ("lisp/emacs-lisp/thread.el" . "lisp/thread.el")
+     ("lisp/emacs-lisp/cl.el" . "lisp/emacs-lisp/cl-lib.el")
+     ("lisp/progmodes/mantemp.el" . "lisp/obsolete/mantemp.el")
 +    ("src/mini-gmp.c" . "lib/mini-gmp.c")
 +    ("src/mini-gmp.h" . "lib/mini-gmp.h")
+     ("sysdep.c" . "src/sysdep.c")
      )
    "Alist of files which have been renamed during their lifetime.
  Elements are (OLDNAME . NEWNAME).")