unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Jim Porter <jporterbugs@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: luangruo@yahoo.com, 71741@debbugs.gnu.org,
	stefankangas@gmail.com, epg@pretzelnet.org
Subject: bug#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww
Date: Mon, 24 Jun 2024 14:04:53 -0700	[thread overview]
Message-ID: <0aa521b4-817a-241c-65d3-6ae11cc9a14d@gmail.com> (raw)
In-Reply-To: <86wmmeblhl.fsf@gnu.org>

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.)





  parent reply	other threads:[~2024-06-24 21:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-23 23:13 bug#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww epg
2024-06-23 23:24 ` Stefan Kangas
2024-06-24  0:32   ` Jim Porter
2024-06-24 11:58     ` Eli Zaretskii
2024-06-24 12:38       ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-24 21:04       ` Jim Porter [this message]
2024-06-24 21:56         ` Stefan Kangas
2024-06-25  4:39           ` Jim Porter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0aa521b4-817a-241c-65d3-6ae11cc9a14d@gmail.com \
    --to=jporterbugs@gmail.com \
    --cc=71741@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    --cc=epg@pretzelnet.org \
    --cc=luangruo@yahoo.com \
    --cc=stefankangas@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).