diff options
author | Glenn Morris <rgm@gnu.org> | 2020-03-18 07:50:37 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-03-18 07:50:37 -0700 |
commit | 64d9b4cd762cd39749b899343cb4878e5998a170 (patch) | |
tree | d53ca326b506c75d3151a37ac35a199ae7c780e3 /src/timefns.c | |
parent | d815e1ea521aac866eb9c305b64a1d4486fea86f (diff) | |
parent | e92b8e535aa599fa4477578f3e5d0657e494fdd0 (diff) | |
download | emacs-64d9b4cd762cd39749b899343cb4878e5998a170.tar.gz |
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
Diffstat (limited to 'src/timefns.c')
0 files changed, 0 insertions, 0 deletions