From: Stefan Kangas Date: Tue, 19 Apr 2022 04:51:47 +0000 (+0200) Subject: ; Merge from origin/emacs-28 X-Git-Tag: emacs-29.0.90~1931^2~411 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f2ef27f49e2ea22cf38b84efc8e927c0240f16d;p=emacs.git ; Merge from origin/emacs-28 The following commits were skipped: 1b77362771 Avoid hangs in python-mode with debug-on-error set 4684b8e62f Fix major-mode setting regression when there's a mode: cookie --- 7f2ef27f49e2ea22cf38b84efc8e927c0240f16d