From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 20 Apr 2022 04:30:27 +0000 (+0200)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1931^2~394
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebde448a14d44719b78b8b873a88448b73d72572;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

1030cc1897 Fix regression with multiple mode: entries in the prop line
---

ebde448a14d44719b78b8b873a88448b73d72572