From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 22 Feb 2022 05:30:59 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bee54495e92ddf5d75e3f68ac7e823b221306719;p=emacs.git

Merge from origin/emacs-28

666e40a109 Fix 'display-line-numbers-mode' in hide-show buffers
68d134cf0f Don't check whether a deleted window is deletable (Bug#54028)
b38223a844 A friendlier error message from image-mode in an empty buffer
b7a651ba37 Update to Org 9.5.2-17-gea6b74
3a8c3f7abd ; Don't reference obsolete variables in edebug.el
---

bee54495e92ddf5d75e3f68ac7e823b221306719