From: Glenn Morris <rgm@gnu.org>
Date: Wed, 7 Apr 2021 14:50:17 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~2977
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70b452e2bc5b3a122dce73ae361224cc29751ed4;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

e2d199aa44 Fix crash when using menus and tramp on NS
---

70b452e2bc5b3a122dce73ae361224cc29751ed4