]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 9 Dec 2021 13:53:51 +0000 (14:53 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 9 Dec 2021 13:53:51 +0000 (14:53 +0100)
commit6ecb24f877242371a0dbc7938e9b408df2690dc7
treeea0b2cc105dec7ec2be2eebff8f0a9115e78c213
parent24e9616a0fefd1b3b60086eb6c88c15409ff42f7
parent1821844357e60eccbc269fb9455579061a6f30b2
Merge from origin/emacs-28

1821844357 Add missing K key documentation for Cangjie input methods
be860c1385 Fix manual entry of 'quit-restore-window' (Bug#52328)
35a96139df Clarify a comment in xdisp.c
6ba2f028cf Revert "Grep alias `all' shall not match parent directory"
eb9e33e238 ; * etc/NEWS: Non-nil repeat-keep-prefix is not the defaul...
538fc1d0e0 Fix mode-line display in Calendar mode

# Conflicts:
# etc/NEWS
# lisp/help.el
doc/lispref/help.texi
doc/lispref/windows.texi
etc/NEWS.28
lisp/help.el
lisp/progmodes/grep.el
src/xdisp.c