From: Glenn Morris <rgm@gnu.org>
Date: Fri, 29 Oct 2021 16:20:05 +0000 (-0700)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3671^2~354
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=faa2a990c980bfdedbc76520083f1228806f3df2;p=emacs.git

Merge from origin/emacs-28

52e7049b58 * lisp/loadup.el: Unbreak build.
91e7df281e Move lisp/shorthands.el to lisp/emacs-lisp/shorthands.el
00103154e0 Some Tramp changes, mainly in tramp-tests.el
---

faa2a990c980bfdedbc76520083f1228806f3df2