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#59137: [PATCH] To minor changes related to overlays Date: Sat, 26 Nov 2022 12:07:28 -0800 Message-ID: References: <87edudm43j.fsf@rfc20.org> <834jv7rt5p.fsf@gnu.org> <87edu46r4z.fsf@rfc20.org> <87k03hpkwh.fsf@rfc20.org> 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="4046"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 59137@debbugs.gnu.org To: Matt Armstrong , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Nov 26 21:08:22 2022 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 1oz1TK-0000t0-I4 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 26 Nov 2022 21:08:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oz1T1-0003Rs-G1; Sat, 26 Nov 2022 15:08:03 -0500 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 1oz1T0-0003Ri-8W for bug-gnu-emacs@gnu.org; Sat, 26 Nov 2022 15:08:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oz1T0-0002jd-0k for bug-gnu-emacs@gnu.org; Sat, 26 Nov 2022 15:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oz1Sz-0006hu-QX for bug-gnu-emacs@gnu.org; Sat, 26 Nov 2022 15:08:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 26 Nov 2022 20:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59137 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59137-submit@debbugs.gnu.org id=B59137.166949325925776 (code B ref 59137); Sat, 26 Nov 2022 20:08:01 +0000 Original-Received: (at 59137) by debbugs.gnu.org; 26 Nov 2022 20:07:39 +0000 Original-Received: from localhost ([127.0.0.1]:41518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz1Sc-0006hg-JH for submit@debbugs.gnu.org; Sat, 26 Nov 2022 15:07:38 -0500 Original-Received: from mail-ot1-f50.google.com ([209.85.210.50]:44991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz1SZ-0006hZ-79 for 59137@debbugs.gnu.org; Sat, 26 Nov 2022 15:07:37 -0500 Original-Received: by mail-ot1-f50.google.com with SMTP id p8-20020a056830130800b0066bb73cf3bcso4624203otq.11 for <59137@debbugs.gnu.org>; Sat, 26 Nov 2022 12:07:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=UBlQ5qfsU9xhH/DYOqVwk80mtswPUyg+o5i6iw08nfg=; b=VQ5SG9hqCq/x8I4h4qXPzHLfz835/J8fwMV1CoI7NVlaW3swzvG0vYlQTPcSpRTb1x GjxHljhFGY3uhfbA4Th9CQHm5oR42qbUDZI3q2gtXxU9D7hgjf641ZxNyWH+JpATHOPN cbwXj+7nbEQ0+2Boxo9fNvWjSmm+OXuEFWEINwdCmIEqSFUVsyQm44yIxv4vJHakYx73 3HNgjRRlk8j2ZE7M7Zp/QbkCd/17pP5WqMfxW0+PFSm+ObQZyOCqYl/PjyQZa/CjUbD4 /nNb6IX2uhFsTDqjDaWEZdE79r8fUHDD81bNYIipx7rksq22A7ryYuAgMPNfbP6APlij Fo4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UBlQ5qfsU9xhH/DYOqVwk80mtswPUyg+o5i6iw08nfg=; b=k4FvT+UjSp64TPloMoIvyrG7RO5K9na6f7zTBNlNZ9CrenSHyu9+jqtOUSrpTv15AZ aO+peXw5d5rpDPCXZZZ734W6dgXShsrX4S/x2Ljyvm6g7JdWd4DX9Xjzd3AzYKV8CuPH pnrCZ9w93cJkQQqsBSJa/2HG9Rcj5QgLSMYLJ2DQtmwV63oqGgtzihY6ib81EHn/jwbO lYvVfwhdu0A3HTfTPGSGcud9saSbRN4/cq/q2FAsnfDUsrtV8i/BYgHEM4kwIXpVFJxj xgPiy1fQkybftl3GM1/oYv6qPwxGyLkIehsWwercvBZtWiqS0cMeyv/cFM9g7um1tfA6 f/NQ== X-Gm-Message-State: ANoB5plqx+zbtFvkXXzweC1V+g0vQTb+fimnNC6FezCD91Q/q0SPKFV7 SA3s3SU1lopUuww+EF0YtIKjdqJaZmNs1d/34/4= X-Google-Smtp-Source: AA0mqf40OAHhq18fsCsQ0hjQEgQZg2b3rTf2mNoUUjCb74B+kbA53Zm0cbinS4BawjMqcPaiQ88jGFmx6K8FkXNWGY4= X-Received: by 2002:a9d:5c81:0:b0:661:c48b:12db with SMTP id a1-20020a9d5c81000000b00661c48b12dbmr13368649oti.105.1669493249453; Sat, 26 Nov 2022 12:07:29 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 26 Nov 2022 12:07:28 -0800 In-Reply-To: <87k03hpkwh.fsf@rfc20.org> X-Hashcash: 1:20:221126:matt@rfc20.org::3oALhtuRNJjLz01I:3W+Q 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:249138 Archived-At: Matt Armstrong writes: > Attached is the rebased patch for the new helper function (it didn't > change much if at all). As Stefan suggested, the patch for the iterator > is no longer relevant. Thanks. > From 3e2c4cd143d51c66198dd606e18015eeae42f3ec Mon Sep 17 00:00:00 2001 > From: Matt Armstrong > Date: Tue, 8 Nov 2022 15:00:18 -0800 > Subject: [PATCH] Add itree_empty_p for clarity and reduced coupling > > * src/itree.h (itree_empty_p): New predicate. > * src/buffer.h (buffer_has_overlays): Call it. > * src/pdumper.c (dump_buffer): ditto. > * src/alloc.c (mark_buffer): ditto. Equivalently, you can leave out "ditto" so the above is just the below (I added the bug number too, according to our conventions): * src/itree.h (itree_empty_p): New predicate. * src/buffer.h (buffer_has_overlays): * src/pdumper.c (dump_buffer): * src/alloc.c (mark_buffer): Call it. (Bug#59137) > --- > src/alloc.c | 2 +- > src/buffer.h | 3 +-- > src/itree.h | 9 +++++++++ > src/pdumper.c | 2 +- > 4 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/src/alloc.c b/src/alloc.c > index 0653f2e0cc..526a25393f 100644 > --- a/src/alloc.c > +++ b/src/alloc.c > @@ -6553,7 +6553,7 @@ mark_buffer (struct buffer *buffer) > if (!BUFFER_LIVE_P (buffer)) > mark_object (BVAR (buffer, undo_list)); > > - if (buffer->overlays) > + if (!itree_empty_p (buffer->overlays)) > mark_overlays (buffer->overlays->root); I'm not familiar with this code at all, but I note that the condition here changes from: buffer->overlays to buffer->overlays && buffer->overlays->root Is that correct? Unless I missed something, the patch description doesn't say anything about it.