From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Mar 2021 15:26:35 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ab85f560eb78e77f743309ee7e331444dd7c5a2;p=emacs.git

; Merge from origin/emacs-27

The following commits were skipped:

6a4ed891d8 Fix replace-buffer-contents undefined behavior
720a8b17f8 Fix filenotify-tests.el for Solaris (bug#47262), do not merge
---

8ab85f560eb78e77f743309ee7e331444dd7c5a2