Merge from origin/emacs-28

author Paul Eggert <eggert@cs.ucla.edu>

Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)

committer Paul Eggert <eggert@cs.ucla.edu>

Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)
author Paul Eggert <eggert@cs.ucla.edu>
Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)
committer Paul Eggert <eggert@cs.ucla.edu>
Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)
diff --cc lib-src/emacsclient.c
Simple merge
diff --cc src/sysdep.c
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Sun, 17 Apr 2022 20:10:19 +0000 (13:10 -0700)
		1	2
lib-src/emacsclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/sysdep.c	patch \|	diff1 \|	diff2 \|	blob \| history