]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorEli Zaretskii <eliz@gnu.org>
Fri, 18 Feb 2022 08:38:42 +0000 (10:38 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 18 Feb 2022 08:38:42 +0000 (10:38 +0200)
# Conflicts:
# lisp/startup.el

1  2 
doc/lispref/display.texi
lisp/international/fontset.el
lisp/startup.el

Simple merge
Simple merge
diff --cc lisp/startup.el
Simple merge