Merge branch 'emacs-28'
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 24 Sep 2022 14:32:39 +0000 (10:32 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sat, 24 Sep 2022 14:32:39 +0000 (10:32 -0400)
1  2 
lisp/progmodes/hideshow.el
src/keyboard.c

Simple merge
diff --cc src/keyboard.c
Simple merge