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 v3 04/15] Combine unnecessarily separate loops in buffer.c Date: Thu, 6 May 2021 17:33:35 -0400 Message-ID: <20210506213346.9730-5-sbaugh@catern.com> References: <877dkbsj9d.fsf@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="39365"; 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 Thu May 06 23:34:58 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 1lele5-000A67-T2 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 23:34:57 +0200 Original-Received: from localhost ([::1]:33874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lele4-00069H-US for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 17:34:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leldI-0005Kt-Dt for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:34:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leldI-0001pH-6k for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:34:08 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leldI-0000CI-55 for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:34:08 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 06 May 2021 21:34:08 +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.1620336846735 (code B ref 48264); Thu, 06 May 2021 21:34:08 +0000 Original-Received: (at 48264) by debbugs.gnu.org; 6 May 2021 21:34:06 +0000 Original-Received: from localhost ([127.0.0.1]:39864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leldE-0000BK-VF for submit@debbugs.gnu.org; Thu, 06 May 2021 17:34:05 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:41478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leld8-00009s-PB for 48264@debbugs.gnu.org; Thu, 06 May 2021 17:33:59 -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=1620336838; bh=4A7sFotf1TfnIWghFuSNPhK+ZeczRfZ8+fI2fo7WkV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EWFop7mjD287Erz4LLYphGe5p/jRfq8M5g3s0K4F3i1a/MHC8vDtYWTny0WopeJr5 F2QkuCMqAbhJN0igRCgH6Pl4SWH4BwMMNloQzv21tpdd9MCGqHLG9XV9OLYX8tgJt5 zdheuGBjCX1J9kDKnIzRzBSS4us4MrN5cOCcr0dQ= 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 613C12E87C0; Thu, 6 May 2021 21:33:58 +0000 (UTC) X-Mailer: git-send-email 2.31.1 In-Reply-To: <877dkbsj9d.fsf@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:205884 Archived-At: These loops iterate over the same things with the same check. * src/buffer.c (reset_buffer_local_variables): Combine loops --- src/buffer.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 3427022ace..c2a268adec 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1006,7 +1006,7 @@ reset_buffer (register struct buffer *b) static void reset_buffer_local_variables (struct buffer *b, bool permanent_too) { - int offset, i; + int offset; /* Reset the major mode to Fundamental, together with all the things that depend on the major mode. @@ -1100,10 +1100,6 @@ reset_buffer_local_variables (struct buffer *b, bool permanent_too) } } - for (i = 0; i < last_per_buffer_idx; ++i) - if (permanent_too || buffer_permanent_local_flags[i] == 0) - SET_PER_BUFFER_VALUE_P (b, i, 0); - /* For each slot that has a default value, copy that into the slot. */ FOR_EACH_PER_BUFFER_OBJECT_AT (offset) { @@ -1111,7 +1107,10 @@ reset_buffer_local_variables (struct buffer *b, bool permanent_too) if ((BUFFER_DEFAULT_VALUE_P (offset) && (permanent_too || buffer_permanent_local_flags[idx] == 0))) - set_per_buffer_value (b, offset, per_buffer_default (offset)); + { + SET_PER_BUFFER_VALUE_P (b, idx, 0); + set_per_buffer_value (b, offset, per_buffer_default (offset)); + } } } -- 2.31.1