From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 20 Nov 2021 06:19:43 +0000 (+0100)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2852^2~178
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=824f0de83626cb3ac2c07b161d3d1e8ee3d93b33;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

9b08846faa Add upward compatibility entry in Tramp (don't merge)
---

824f0de83626cb3ac2c07b161d3d1e8ee3d93b33