]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorGlenn Morris <rgm@gnu.org>
Fri, 29 Oct 2021 16:19:51 +0000 (09:19 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 29 Oct 2021 16:19:51 +0000 (09:19 -0700)
commit502a00b8b91d68ee6cbd0dfec40ac409ec08e67a
treeab5aa1deae3279dd50888561b2de2b741025668c
parent288e8bba81d9921a9b34627e6641afa74e41b49d
parent7e2b973d60cfd30f1828fabd8d9f33127f24e54a
Merge from origin/emacs-28

7e2b973d60 * lisp/textmodes/text-mode.el (text-mode-context-menu): Re...
da6d889e90 ; * etc/NEWS: Use active voice for 'repeat-mode', etc.
e3171e7e86 Allow automatic use of color fonts for emoji on macOS

# Conflicts:
# etc/NEWS
etc/NEWS.28