]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 23 Nov 2020 17:41:53 +0000 (09:41 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 23 Nov 2020 17:41:53 +0000 (09:41 -0800)
commitbe17ee78c659d0ddded4c536e10777cac2852884
tree7f4a926bb1740738364a3797824d97fad56c4408
parenta8c513b6f56ec33b23de94395c949427fcb86ca1
parent86cbc9d216c724e6be5db27fb33df2ca0c7d9804
Merge from origin/emacs-27

86cbc9d216 Make ignoring modifiers on IME input optional
32b97bb9e0 Ignore modifiers when processing WM_IME_CHAR messages
f641ef1a07 Improve documentation of 'font-spec'

# Conflicts:
# etc/NEWS
doc/lispref/display.texi
etc/NEWS.27
src/font.c
src/w32fns.c