From: Spencer Baugh <sbaugh@catern.com>
To: emacs-devel@gnu.org
Cc: Spencer Baugh <sbaugh@catern.com>, Eli Zaretskii <eliz@gnu.org>,
Stefan Monnier <monnier@iro.umontreal.ca>
Subject: [PATCH 6/7] Assert that PER_BUFFER_IDX for Lisp variables is not 0
Date: Tue, 23 Mar 2021 23:11:56 -0400 [thread overview]
Message-ID: <f3f0c1f11e6b1d3ff80da480f678621d8025d1f9.1616554376.git.sbaugh@catern.com> (raw)
In-Reply-To: <cover.1616554376.git.sbaugh@catern.com>
PER_BUFFER_IDX can't be 0 for Lisp variables - so this if-check was
always pointless.
* src/data.c (default_value): Change if to eassert
---
src/data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/data.c b/src/data.c
index 0fa491b17a..2de76099ca 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1709,8 +1709,8 @@ default_value (Lisp_Object symbol)
if (BUFFER_OBJFWDP (valcontents))
{
int offset = XBUFFER_OBJFWD (valcontents)->offset;
- if (PER_BUFFER_IDX (offset) != 0)
- return per_buffer_default (offset);
+ eassert (PER_BUFFER_IDX (offset) != 0);
+ return per_buffer_default (offset);
}
/* For other variables, get the current value. */
--
2.28.0
next prev parent reply other threads:[~2021-03-24 3:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 3:11 [PATCH 0/7] Cleanups and tests for DEFVAR_PER_BUFFER variables Spencer Baugh
2021-03-24 3:11 ` [PATCH 1/7] Add a test for let-binding unwinding Spencer Baugh
2021-03-24 3:11 ` [PATCH 2/7] Assert not local-variable-p after setq in let_default binding Spencer Baugh
2021-03-24 3:11 ` [PATCH 3/7] Stop checking the constant default for enable_multibyte_characters Spencer Baugh
2021-03-24 3:11 ` [PATCH 4/7] Take buffer field name in DEFVAR_PER_BUFFER Spencer Baugh
2021-03-24 3:11 ` [PATCH 5/7] Combine unnecessarily separate loops in buffer.c Spencer Baugh
2021-03-24 3:11 ` Spencer Baugh [this message]
2021-03-24 3:11 ` [PATCH 7/7] Remove unnecessary Qunbound check Spencer Baugh
2021-03-25 16:46 ` Stefan Monnier
2021-03-24 5:36 ` [PATCH 0/7] Cleanups and tests for DEFVAR_PER_BUFFER variables Eli Zaretskii
2021-03-25 16:48 ` Stefan Monnier
2021-03-25 17:00 ` Eli Zaretskii
2021-04-01 18:13 ` Spencer Baugh
2021-04-01 18:51 ` Eli Zaretskii
2021-04-03 20:53 ` Spencer Baugh
2021-04-04 7:15 ` Eli Zaretskii
2021-04-01 21:42 ` Stefan Monnier
2021-04-01 23:39 ` Spencer Baugh
2021-04-02 2:55 ` Stefan Monnier
2021-04-02 5:36 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f3f0c1f11e6b1d3ff80da480f678621d8025d1f9.1616554376.git.sbaugh@catern.com \
--to=sbaugh@catern.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).