Merge branch 'derived-mode-add-parents'

author Stefan Monnier <monnier@iro.umontreal.ca>

Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)

committer Stefan Monnier <monnier@iro.umontreal.ca>

Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)
author Stefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)
committer Stefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)
diff --cc doc/lispref/modes.texi
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Stefan Monnier <monnier@iro.umontreal.ca>
	Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Thu, 16 Nov 2023 14:57:38 +0000 (09:57 -0500)
		1	2
doc/lispref/modes.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history