From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 16 Nov 2023 14:57:38 +0000 (-0500)
Subject: Merge branch 'derived-mode-add-parents'
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~3538
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4194f9bd8705b7ccc23f49aa5795af228dab26bb;p=emacs.git

Merge branch 'derived-mode-add-parents'
---

4194f9bd8705b7ccc23f49aa5795af228dab26bb