; Merge from origin/emacs-27
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Mar 2021 15:26:35 +0000 (08:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Mar 2021 15:26:35 +0000 (08:26 -0700)
The following commits were skipped:

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


Trivial merge