bug#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww

[Jim Porter]

On 6/24/2024 4:58 AM, Eli Zaretskii wrote:
> I think changes in get-display-property and in find_display_property
> must wait for Emacs 31.  They are used in too many places to be a safe
> change for the release branch.

Sounds good to me. Is the following a good way to merge these?

* Install the first patch to the emacs-30 branch
* Install both patches to the master branch
* Push to Savannah

I just want to be sure I don't mess up the automerge. (If it would be 
safer for me to install the first patch to emacs-30, automerge to 
master, and then install the second patch, I can do that. I'd just have 
to re-learn how to use the automerge script, since it's been a while for 
me.)