Merge from origin/emacs-27

291a421c2e * admin/make-tarball.txt: Improve and expand the instructi...
0e4795fc98 Fix preeditarea reporting wrong spot.

diff --cc admin/make-tarball.txt
index 9caf22d71885d0a1fee50860f437370d0a55377b,65c6e86b1dfa7c59e0a00f90a361e2d060bcaf83..418cf91ae295cb586939e6e2327ee2cbca8b118d
--- 1/admin/make-tarball.txt
--- 2/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@@ -82,15 -79,21 +82,21 @@@ General steps (for each step, check fo
      Before a release candidate is made, the tasks listed in
      admin/release-process must be completed.
  
 -    Set the version number to that of the actual release.  Pick a date
 -    about a week from now when you intend to make the release.  Use M-x
 -    add-release-logs to add entries to etc/HISTORY and the ChangeLog
 -    file.  It's best not to commit these files until the release is
 -    actually made.  Merge the entries from (unversioned) ChangeLog
 -    into the top of the current versioned ChangeLog.N and commit that
 -    along with etc/HISTORY.  Then you can tag that commit as the
 -    release.
 +    Set the version number to that of the actual release (commit in
 +    one, as described above). Pick a date about a week from now when
 +    you intend to make the release.  Use M-x add-release-logs to add
 +    entries to etc/HISTORY and the ChangeLog file.  It's best not to
 +    commit these files until the release is actually made.  Merge the
 +    entries from (unversioned) ChangeLog into the top of the current
 +    versioned ChangeLog.N and commit that along with etc/HISTORY.
 +    Then you can tag that commit as the release.
  
+     Alternatively, you can commit and tag with the RC tag right away,
+     and delay the final tagging until you actually decide to make a
+     release and announce it.  The "git tag" command can tag a specific
+     commit if you give it the SHA1 of that commit, even if additional
+     commits have been pushed in the meantime.
+ 
      Name the tar file as emacs-XX.Y-rc1.tar.  If all goes well in the
      following week, you can simply rename the file and use it for the
      actual release.  If you need another release candidate, remember

diff --cc src/xfns.c
Simple merge