]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Tue, 27 Oct 2020 15:24:56 +0000 (08:24 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 27 Oct 2020 15:24:56 +0000 (08:24 -0700)
commit0dfb896be2d84e069831faf3499fe6add629af62
treef1a660bb7e0bb41a45c57484863663427750482b
parentdcd1095bc40f87d9ff6d8c7206221412970a3d95
parente0de9f3295b4c46cb7198ec0b9634809d7b7a36d
Merge from origin/emacs-27

e0de9f3295 (origin/emacs-27) Don't skip empty lines when fitting mini...
a4ec03fa9b ; * etc/tutorials/TUTORIAL.de: Fix grammar (Bug#44246)
20c02e628c Improve documentation of display-fill-column-indicator
e2005f1f2a * INSTALL: Mention efaq.texi for installation of intlfonts.
71661b2872 Use WebKit sandboxing

# Conflicts:
# etc/NEWS
INSTALL
doc/emacs/display.texi
doc/lispref/minibuf.texi
etc/NEWS.27
etc/tutorials/TUTORIAL.de
lisp/cus-start.el
lisp/display-fill-column-indicator.el
lisp/window.el
src/frame.c
src/xdisp.c
src/xwidget.c