[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/7] Combine unnecessarily separate loops in buffer.c
From: |
Spencer Baugh |
Subject: |
[PATCH 5/7] Combine unnecessarily separate loops in buffer.c |
Date: |
Tue, 23 Mar 2021 23:11:55 -0400 |
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 de3b202ebc..563e5b7180 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 ((idx > 0
&& (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.28.0
- [PATCH 0/7] Cleanups and tests for DEFVAR_PER_BUFFER variables, Spencer Baugh, 2021/03/23
- [PATCH 3/7] Stop checking the constant default for enable_multibyte_characters, Spencer Baugh, 2021/03/23
- [PATCH 4/7] Take buffer field name in DEFVAR_PER_BUFFER, Spencer Baugh, 2021/03/23
- [PATCH 2/7] Assert not local-variable-p after setq in let_default binding, Spencer Baugh, 2021/03/23
- [PATCH 1/7] Add a test for let-binding unwinding, Spencer Baugh, 2021/03/23
- [PATCH 6/7] Assert that PER_BUFFER_IDX for Lisp variables is not 0, Spencer Baugh, 2021/03/23
- [PATCH 5/7] Combine unnecessarily separate loops in buffer.c,
Spencer Baugh <=
- [PATCH 7/7] Remove unnecessary Qunbound check, Spencer Baugh, 2021/03/23
- Re: [PATCH 0/7] Cleanups and tests for DEFVAR_PER_BUFFER variables, Eli Zaretskii, 2021/03/24