From: Glenn Morris <rgm@gnu.org>
Date: Mon, 18 Jun 2018 19:14:26 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4800
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96dd452be5b4accbd72864573f479d8b66d5e0e5;p=emacs.git

; Merge from origin/emacs-26

The following commits were skipped:

48829cb Handle NSAttributedString inputs (bug#29837)
0deab3f Allow inserting non-BMP characters
---

96dd452be5b4accbd72864573f479d8b66d5e0e5