]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorGlenn Morris <rgm@gnu.org>
Sat, 9 Oct 2021 14:50:36 +0000 (07:50 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 9 Oct 2021 14:50:36 +0000 (07:50 -0700)
commitcc202c713be60355dbcf4e5ea87603c5e16a92db
tree718f701ca6622f242172eb138a983b343efb0f5d
parentfecc4c0f79bbfcae3c6dd0ad8331a8ef6faa4034
parent394209c1a012ec0d24cbef031101c82a79ceea83
Merge from origin/emacs-28

394209c1a0 (origin/emacs-28) ; Fix indentation in etc/NEWS
81f20e8b89 Fix thinko in ls-lisp--insert-directory
ec9f25bd35 Mention that RET means "yes" in y-or-n-p
00eb21c897 ; * src/dispextern.h (struct glyph_string): Comment on NCH...
20eb3644ba Rewrite Antinews for Emacs 28
3a9b881603 ; * etc/NEWS: Rearrange the "incompatible changes" sections.
ebb7e26013 ; * etc/NEWS: Fix a typo.
315fe20086 ; * src/Makefile.in (../native-lisp): Add comment.
47cbd103f5 * lisp/bindings.el (mode-line-position): Improve tooltip.
35a752863a * lisp/progmodes/xref.el: Bump the version.
bbcd8cc1a9 Slight simplificaiton
e139dd1b1e Fix doc strings of 2 categories
59782839cb (xref--collect-matches-1): Remove some intermediate alloca...
1c7d056f4d ; Fix two typos where em dash was written as en dash

# Conflicts:
# etc/NEWS
doc/misc/ert.texi
etc/NEWS.28
lisp/progmodes/xref.el
lisp/subr.el