From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Dec 2020 17:23:37 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a47001ae46dddc010d976209dab3eee44e0ee525;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

6aa9fe3e1b Fix crash in ns_mouse_position (bug#44313)
---

a47001ae46dddc010d976209dab3eee44e0ee525