]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Wed, 18 Mar 2020 14:50:37 +0000 (07:50 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 18 Mar 2020 14:50:37 +0000 (07:50 -0700)
commit64d9b4cd762cd39749b899343cb4878e5998a170
treed53ca326b506c75d3151a37ac35a199ae7c780e3
parentd815e1ea521aac866eb9c305b64a1d4486fea86f
parente92b8e535aa599fa4477578f3e5d0657e494fdd0
Merge from origin/emacs-27

e92b8e535a (origin/emacs-27) Remove raw carriage return characters fr...
5747a59a88 Recalculate default font when switching font backend
a2dd8c4234 * lisp/tab-line.el: Fix tab-line-format and tab-line-forma...
a7b8291b6c * etc/NEWS: Make the `--eval` example slightly more precise
f8254aad14 * lisp/image/image-converter.el: Support more ImageMagick ...
5beb269505 Support Unicode 13.0
3a671ad7ed Fix regression in wisent-total-conflicts

# Conflicts:
# etc/NEWS
etc/NEWS.27
lisp/international/mule-cmds.el
src/frame.c
src/nsterm.m
src/xfns.c
src/xterm.c
test/lisp/international/ucs-normalize-tests.el