]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Sun, 27 Sep 2020 16:37:10 +0000 (09:37 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 27 Sep 2020 16:37:10 +0000 (09:37 -0700)
commit2e8c9ede155668167e509ddb80c6a46dab8d70fe
tree200d823eb9522f7531e8a31073ed003333cb34f4
parenta492013d07c59fab8eb9779924b384181e878a1a
parentf31c6792ab98c8be343838f59d96e35c05353521
Merge from origin/emacs-27

f31c6792ab Fix support for Zip64 zip files
ba635a19fb * lisp/hi-lock.el (hi-lock-auto-select-face): Doc fix.  (B...
cc8fef2bdd Avoid infinite recursion with 'relative' line numbers display
395f10cb98 ; Fix more trivial typos
bf4accb65e ; Fix some trivial typos

# Conflicts:
# etc/NEWS
# lisp/arc-mode.el
doc/emacs/custom.texi
doc/emacs/maintaining.texi
doc/lispref/display.texi
doc/lispref/internals.texi
doc/lispref/modes.texi
doc/misc/tramp.texi
etc/NEWS.27
lisp/arc-mode.el
lisp/hi-lock.el
src/xdisp.c