From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs 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:56:57 -0700 Message-ID: References: <8734p38d8h.fsf@pretzelnet.org> <1c42d70b-e494-9495-4759-56a2acade7fe@gmail.com> <86wmmeblhl.fsf@gnu.org> <0aa521b4-817a-241c-65d3-6ae11cc9a14d@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26515"; mail-complaints-to="usenet@ciao.gmane.io" Cc: luangruo@yahoo.com, 71741@debbugs.gnu.org, epg@pretzelnet.org To: Jim Porter , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 24 23:59:18 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sLriX-0006my-Ti for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 24 Jun 2024 23:59:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLriI-0001mq-Cy; Mon, 24 Jun 2024 17:59:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLriH-0001mR-Df for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 17:59:01 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sLriH-0003kn-5T for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 17:59:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLriI-0007aW-D2 for bug-gnu-emacs@gnu.org; Mon, 24 Jun 2024 17:59:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 24 Jun 2024 21:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71741 X-GNU-PR-Package: emacs Original-Received: via spool by 71741-submit@debbugs.gnu.org id=B71741.171926629029075 (code B ref 71741); Mon, 24 Jun 2024 21:59:02 +0000 Original-Received: (at 71741) by debbugs.gnu.org; 24 Jun 2024 21:58:10 +0000 Original-Received: from localhost ([127.0.0.1]:35745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLrhR-0007Yt-Ul for submit@debbugs.gnu.org; Mon, 24 Jun 2024 17:58:10 -0400 Original-Received: from mail-ed1-f46.google.com ([209.85.208.46]:46546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLrhN-0007YL-UK for 71741@debbugs.gnu.org; Mon, 24 Jun 2024 17:58:08 -0400 Original-Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-57d10354955so5314299a12.1 for <71741@debbugs.gnu.org>; Mon, 24 Jun 2024 14:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719266219; x=1719871019; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=GVwis8u+SpT10en1TGJ/vir6GGQ4MtIMSDAloW5hHz4=; b=GORbFEKUlJ9Np+fxy38TnT3tJ5YBVjFGvw13xX3XVJ8Ql0pnPbBWCa8b3X5KLj7+FD OPmo0GSgvHivDKHZSq6nD8GtQvGH3xXRgiSohxkQbXFpE4PihT/hxk6F5HayvCJczxy0 TSb/2M83TJV7acni6QIqcqo96Qr9XujXI3OVRmhKtzvVkCcHIiELh52qzaTgRuFf21vU 4Gd2Wlt2EWvLR2n7Fu+FQtHFGRhMVpH+b3O7X+Oi8uTYVZep7mqMC6x7DwWREVcKer5F 2qRijrSNwAkzaz7KIpttbltuHr7xgeSUpYkVtp9acWZHDtdP4X/WcSXSGCLxwcwsiD2s Fmxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719266219; x=1719871019; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GVwis8u+SpT10en1TGJ/vir6GGQ4MtIMSDAloW5hHz4=; b=hNFpCRkOtk2t3xda5XVgQqfOJpMXw9u+5MSxcTruL2T49uNp3lRVXeMEJRLr/0tB7Z kUSTNeL8JK/Bh/UpxgtBFlmXUz+gdCYxTzm+EaFGC14l6OjvI0n7JhpZaA161fdZzUdb DbUBVkOp3i5FuSeKK5VXZubWiCfFIYW3dHgeH+jZR7dxze8WtkQ+PGS/5Qbdwxt2ZNQl /pxDdgAjlD5ouh9AARPApTmXrFyU6Uq3/yk1JsxflqPVd3aRoa++bAtPCmv9s8jK5ZsA r5F2HNPOQpmE+dgYe91RcewLls1kTUn/YKi7C6vFB4sEQgrsrPCzfK7lVIRX7K93ucGv jokA== X-Forwarded-Encrypted: i=1; AJvYcCU8MMkyEWuwqeqDi41fDndO6t0gr9UV3rfO7mpGhItp1R05di+NEEcpDRhGb6zWS0RMlxblvOmHmgp0ddFxlAYgrAtDJus= X-Gm-Message-State: AOJu0YzGth89tVrdkg+m7uqnmp2+wsUHZcmMRA1H0ba/D7Z8XQinqLFa qtvOYm4KoJ8Fn+3zlfGp1H+SXDOSSX1D3tk89fbdT6AqTfTZQ9YOMnoWGho8njIU1adjaksPCL3 Xsce3DEDIUp/BxK8h9QSTdCXJsBY= X-Google-Smtp-Source: AGHT+IESFXfYu6Any2z+CDdL0GS/9s67vjCPkBsBOPPRd8JrIUuXgr0m5IsLPA+ulVIYHrIZrQu4S1oQu4ep0c5yAP4= X-Received: by 2002:a50:9fa7:0:b0:579:cf9d:d6a with SMTP id 4fb4d7f45d1cf-57d49dbeefdmr3824968a12.20.1719266218203; Mon, 24 Jun 2024 14:56:58 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 24 Jun 2024 14:56:57 -0700 In-Reply-To: <0aa521b4-817a-241c-65d3-6ae11cc9a14d@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:287861 Archived-At: Jim Porter writes: > 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. Push both patches to master and then `git cherry-pick -x ` the first one on emacs-30 and push that there. There should be no issue with the merge that way (though it happens every so often anyways because of us moving the etc/NEWS file around between branches).