From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 14 Jul 2022 09:56:56 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1886^2~950
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c516b49daa20beb1afddcfab874ffeb68189b5de;p=emacs.git

Merge from origin/emacs-28

9db6817d63 Remove uneffective test
7af88de410 Mark async worker tmp file as utf-8-emacs-unix (bug#48029)

# Conflicts:
#	test/src/comp-resources/comp-test-45603.el
#	test/src/comp-tests.el
---

c516b49daa20beb1afddcfab874ffeb68189b5de