]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
The following commits were skipped:

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


Trivial merge