From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Spencer Baugh Newsgroups: gmane.emacs.bugs Subject: bug#48264: [PATCH v4 05/14] Add and use KILL_PER_BUFFER_VALUE Date: Fri, 7 May 2021 22:08:56 -0400 Message-ID: <20210508020905.13583-7-sbaugh@catern.com> References: <20210506213346.9730-1-sbaugh@catern.com> <20210508020905.13583-1-sbaugh@catern.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3424"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh To: 48264@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 08 04:49:33 2021 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 1lfD25-0000oF-A6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 08 May 2021 04:49:33 +0200 Original-Received: from localhost ([::1]:45648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfD24-0001du-Bm for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 07 May 2021 22:49:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfCPt-0001KU-Kw for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfCPs-0007X3-O0 for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfCPs-0006Uw-Jl for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 08 May 2021 02:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48264 X-GNU-PR-Package: emacs Original-Received: via spool by 48264-submit@debbugs.gnu.org id=B48264.162043976624833 (code B ref 48264); Sat, 08 May 2021 02:10:04 +0000 Original-Received: (at 48264) by debbugs.gnu.org; 8 May 2021 02:09:26 +0000 Original-Received: from localhost ([127.0.0.1]:47164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfCPF-0006SS-Tj for submit@debbugs.gnu.org; Fri, 07 May 2021 22:09:26 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:47912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfCP9-0006RP-31 for 48264@debbugs.gnu.org; Fri, 07 May 2021 22:09:19 -0400 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=98.7.229.235; helo=localhost; envelope-from=sbaugh@catern.com; receiver= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=catern.com; s=mail; t=1620439758; bh=eSItpu2MwppAumL9g4PeP11fIX5ZBKEozvcUcsv/kio=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T4YhwBvNQxuYuyu+bgKPWSuRsXn02/t4aNJ9+HpBfSMASESR/0QILV3IZLHy7SSa2 8H1/nivihVsNHYBzQWjjfZ49qp3e+dInGHEZ2PUROOmeXWgkxXbZumanipEMjYj6iN 2eZvtAvc0A8qpRKn+nqYzgPEEzWTgx0N2B9oRnJw= Original-Received: from localhost (cpe-98-7-229-235.nyc.res.rr.com [98.7.229.235]) by venus.catern.com (Postfix) with ESMTPSA id 953BF2E982B; Sat, 8 May 2021 02:09:18 +0000 (UTC) X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210508020905.13583-1-sbaugh@catern.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" Xref: news.gmane.io gmane.emacs.bugs:205980 Archived-At: This makes the code more clear and allows us to more easily change how this function is implemented. * src/buffer.h (KILL_PER_BUFFER_VALUE): New function. * src/buffer.c (reset_buffer_local_variables): * src/data.c (Fkill_local_variable): Use KILL_PER_BUFFER_VALUE. --- src/buffer.c | 5 +---- src/buffer.h | 10 ++++++++++ src/data.c | 8 +------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 4336e10a27..2ecbaa91cc 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1107,10 +1107,7 @@ reset_buffer_local_variables (struct buffer *b, bool permanent_too) if ((BVAR_HAS_DEFAULT_VALUE_P (offset) && (permanent_too || buffer_permanent_local_flags[idx] == 0))) - { - SET_PER_BUFFER_VALUE_P (b, idx, 0); - set_per_buffer_value (b, offset, per_buffer_default (offset)); - } + KILL_PER_BUFFER_VALUE (b, offset); } } diff --git a/src/buffer.h b/src/buffer.h index 13fda0c702..31ab4fb3dd 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1502,6 +1502,16 @@ PER_BUFFER_VALUE_P (struct buffer *b, int offset) return idx == -1 || b->local_flags[idx]; } +/* Kill the per-buffer binding for this value, if there is one. */ + +INLINE void +KILL_PER_BUFFER_VALUE (struct buffer *b, int offset) +{ + int idx = PER_BUFFER_IDX (offset); + SET_PER_BUFFER_VALUE_P (b, idx, 0); + set_per_buffer_value (b, offset, per_buffer_default (offset)); +} + /* Downcase a character C, or make no change if that cannot be done. */ INLINE int downcase (int c) diff --git a/src/data.c b/src/data.c index 891a81b7f3..ec9fc57048 100644 --- a/src/data.c +++ b/src/data.c @@ -2154,14 +2154,8 @@ From now on the default value will apply in this buffer. Return VARIABLE. */) if (BUFFER_OBJFWDP (valcontents)) { int offset = XBUFFER_OBJFWD (valcontents)->offset; - int idx = PER_BUFFER_IDX (offset); - if (BVAR_HAS_DEFAULT_VALUE_P (offset)) - { - SET_PER_BUFFER_VALUE_P (current_buffer, idx, 0); - set_per_buffer_value (current_buffer, offset, - per_buffer_default (offset)); - } + KILL_PER_BUFFER_VALUE (current_buffer, offset); } return variable; } -- 2.31.1