From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Apr 2022 17:46:04 +0000 (-0400)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2370^2~495
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25db9dfae00b2638f167d078a076108b8c911fbf;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

78e1640ad5 Fix 'window-text-pixel-width' when starting from display p...
---

25db9dfae00b2638f167d078a076108b8c911fbf