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.devel Subject: [PATCH v2 16/16] Remove usage of buffer_local_flags Date: Sat, 21 Nov 2020 21:34:45 -0500 Message-ID: References: <20201119153814.17541-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="38532"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh , Arnold Noronha , Stefan Monnier , Dmitry Gutov To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 22 03:42:12 2020 Return-path: Envelope-to: ged-emacs-devel@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 1kgfKM-0009rW-CA for ged-emacs-devel@m.gmane-mx.org; Sun, 22 Nov 2020 03:42:10 +0100 Original-Received: from localhost ([::1]:58690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgfKL-0000XX-Ag for ged-emacs-devel@m.gmane-mx.org; Sat, 21 Nov 2020 21:42:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgfDc-0000kn-Px for emacs-devel@gnu.org; Sat, 21 Nov 2020 21:35:12 -0500 Original-Received: from venus.catern.com ([68.183.49.163]:60202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgfDV-0007KH-GL for emacs-devel@gnu.org; Sat, 21 Nov 2020 21:35:12 -0500 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=1606012495; bh=T0a573wYUKlIw4iw9bSpmCfNHCvGB9ANarfTEchAxzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i0BBP6NGshFp2td7DQwrjX25268KCmu+nKR2Dh91tBJEFvQymgwnQzaEyzqFjcIuk Ay9ZpOQ4vohJc55EISvi9QIP5Q3OKWDpBDhZx1aoxIu2N7ZMP/5B3kLM6QxFdw5XBh Q/uKzeAnFmO9SUz14kAsJOcq4BvhtuM7/f6CHUK0= 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 E3F682DDDDF; Sun, 22 Nov 2020 02:34:54 +0000 (UTC) X-Mailer: git-send-email 2.28.0 In-Reply-To: Received-SPF: pass client-ip=68.183.49.163; envelope-from=sbaugh@catern.com; helo=venus.catern.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259585 Archived-At: Previously, we used the buffer_local_flags structure to track which fields in buffer_defaults contain usable defaults, as well as the index into local_flags to use for each struct buffer field. After the immediate previous commit, we don't need the index into local_flags anymore. So all we need is to know whether the fields in buffer_defaults contain usable defaults. We can do that by just setting unusable and unused buffer_defaults fields to Qunbound. Then we can delete buffer_local_flags. In these changes, we delete buffer_local_flags and ensure that buffer_defaults is initialized appropriately for this new usage. --- src/buffer.c | 208 ++++++++------------------------------------------- src/buffer.h | 58 +------------- src/data.c | 1 - 3 files changed, 34 insertions(+), 233 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index b565d232f6..338624f5a4 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -55,28 +55,11 @@ along with GNU Emacs. If not, see . */ defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. The default value occupies the same slot in this structure as an individual buffer's value occupies in that buffer. -*/ + Slots in this structure which are set to Qunbound are permanently + buffer-local. */ struct buffer buffer_defaults; -/* This structure marks which slots in a buffer have corresponding - default values in buffer_defaults. - Each such slot has a nonzero value in this structure. - The value has only one nonzero bit. - - When a buffer has its own local value for a slot, - the entry for that slot (found in the same slot in this structure) - is turned on in the buffer's local_flags array. - - If a slot in this structure is -1, then even though there may - be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; - and the corresponding slot in buffer_defaults is not used. - - If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is - zero, that is a bug. */ - -struct buffer buffer_local_flags; - /* This structure holds the names of symbols whose values may be buffer-local. It is indexed and accessed in the same way as the above. */ @@ -95,10 +78,6 @@ struct buffer buffer_local_symbols; ((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, \ min (PTRDIFF_MAX, SIZE_MAX) / word_size)) -/* Number of per-buffer variables used. */ - -static int last_per_buffer_idx; - static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, bool after, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3); @@ -658,12 +637,6 @@ set_buffer_overlays_after (struct buffer *b, struct Lisp_Overlay *o) b->overlays_after = o; } -bool -valid_per_buffer_idx (int idx) -{ - return 0 <= idx && idx < last_per_buffer_idx; -} - /* Clone per-buffer values of buffer FROM. Buffer TO gets the same per-buffer values as FROM, with the @@ -5106,135 +5079,20 @@ free_buffer_text (struct buffer *b) void init_buffer_once (void) { - /* TODO: clean up the buffer-local machinery. Right now, - we have: - - buffer_defaults: default values of buffer-locals - buffer_local_flags: metadata - buffer_local_symbols: metadata - - There must be a simpler way to store the metadata. - */ - - int idx; - - /* 0 means not a lisp var, -1 means always local, else mask. */ - memset (&buffer_local_flags, 0, sizeof buffer_local_flags); - bset_filename (&buffer_local_flags, make_fixnum (-1)); - bset_directory (&buffer_local_flags, make_fixnum (-1)); - bset_backed_up (&buffer_local_flags, make_fixnum (-1)); - bset_save_length (&buffer_local_flags, make_fixnum (-1)); - bset_auto_save_file_name (&buffer_local_flags, make_fixnum (-1)); - bset_read_only (&buffer_local_flags, make_fixnum (-1)); - bset_major_mode (&buffer_local_flags, make_fixnum (-1)); - bset_mode_name (&buffer_local_flags, make_fixnum (-1)); - bset_undo_list (&buffer_local_flags, make_fixnum (-1)); - bset_mark_active (&buffer_local_flags, make_fixnum (-1)); - bset_point_before_scroll (&buffer_local_flags, make_fixnum (-1)); - bset_file_truename (&buffer_local_flags, make_fixnum (-1)); - bset_invisibility_spec (&buffer_local_flags, make_fixnum (-1)); - bset_file_format (&buffer_local_flags, make_fixnum (-1)); - bset_auto_save_file_format (&buffer_local_flags, make_fixnum (-1)); - bset_display_count (&buffer_local_flags, make_fixnum (-1)); - bset_display_time (&buffer_local_flags, make_fixnum (-1)); - bset_enable_multibyte_characters (&buffer_local_flags, make_fixnum (-1)); - - /* These used to be stuck at 0 by default, but now that the all-zero value - means Qnil, we have to initialize them explicitly. */ - bset_name (&buffer_local_flags, make_fixnum (0)); - bset_mark (&buffer_local_flags, make_fixnum (0)); - bset_local_var_alist (&buffer_local_flags, make_fixnum (0)); - bset_keymap (&buffer_local_flags, make_fixnum (0)); - bset_downcase_table (&buffer_local_flags, make_fixnum (0)); - bset_upcase_table (&buffer_local_flags, make_fixnum (0)); - bset_case_canon_table (&buffer_local_flags, make_fixnum (0)); - bset_case_eqv_table (&buffer_local_flags, make_fixnum (0)); - bset_width_table (&buffer_local_flags, make_fixnum (0)); - bset_pt_marker (&buffer_local_flags, make_fixnum (0)); - bset_begv_marker (&buffer_local_flags, make_fixnum (0)); - bset_zv_marker (&buffer_local_flags, make_fixnum (0)); - bset_last_selected_window (&buffer_local_flags, make_fixnum (0)); - - idx = 1; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, mode_line_format), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, abbrev_mode), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, overwrite_mode), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, case_fold_search), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, auto_fill_function), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, selective_display), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, selective_display_ellipses), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, tab_width), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, truncate_lines), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, word_wrap), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, ctl_arrow), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, fill_column), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, left_margin), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, abbrev_table), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, display_table), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, syntax_table), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, cache_long_scans), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, category_table), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, bidi_display_reordering), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, bidi_paragraph_direction), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, bidi_paragraph_separate_re), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, bidi_paragraph_start_re), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, buffer_file_coding_system), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, left_margin_cols), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, right_margin_cols), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, left_fringe_width), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, right_fringe_width), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, fringes_outside_margins), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, scroll_bar_width), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, scroll_bar_height), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, vertical_scroll_bar_type), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, horizontal_scroll_bar_type), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, indicate_empty_lines), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, indicate_buffer_boundaries), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, fringe_indicator_alist), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, fringe_cursor_alist), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, scroll_up_aggressively), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, scroll_down_aggressively), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, header_line_format), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, tab_line_format), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, cursor_type), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, extra_line_spacing), idx); ++idx; - XSETFASTINT (BVAR_DIRECT (&buffer_local_flags, cursor_in_non_selected_windows), idx); ++idx; - - /* buffer_local_flags contains no pointers, so it's safe to treat it - as a blob for pdumper. */ - PDUMPER_REMEMBER_SCALAR (buffer_local_flags); - - /* Need more room? */ - if (idx >= MAX_PER_BUFFER_VARS) - emacs_abort (); - last_per_buffer_idx = idx; - PDUMPER_REMEMBER_SCALAR (last_per_buffer_idx); - - /* Make sure all markable slots in buffer_defaults - are initialized reasonably, so mark_buffer won't choke. */ - reset_buffer (&buffer_defaults); - eassert (NILP (BVAR_DIRECT (&buffer_defaults, name))); - eassert (NILP (BVAR_DIRECT (&buffer_local_symbols, name))); - reset_buffer (&buffer_local_symbols); - /* Prevent GC from getting confused. */ - buffer_defaults.text = &buffer_defaults.own_text; - buffer_local_symbols.text = &buffer_local_symbols.own_text; - /* No one will share the text with these buffers, but let's play it safe. */ - buffer_defaults.indirections = 0; - buffer_local_symbols.indirections = 0; - /* Likewise no one will display them. */ - buffer_defaults.window_count = 0; - buffer_local_symbols.window_count = 0; - set_buffer_intervals (&buffer_defaults, NULL); - set_buffer_intervals (&buffer_local_symbols, NULL); - /* This is not strictly necessary, but let's make them initialized. */ - bset_name (&buffer_defaults, build_pure_c_string (" *buffer-defaults*")); - bset_name (&buffer_local_symbols, build_pure_c_string (" *buffer-local-symbols*")); BUFFER_PVEC_INIT (&buffer_defaults); BUFFER_PVEC_INIT (&buffer_local_symbols); /* Set up the default values of various buffer slots. */ /* Must do these before making the first buffer! */ + int offset; + FOR_EACH_PER_BUFFER_OBJECT_AT (offset) + { + /* These are initialized before us. */ + if (!(offset == PER_BUFFER_VAR_OFFSET (syntax_table) + || offset == PER_BUFFER_VAR_OFFSET (category_table))) + set_per_buffer_default (offset, Qunbound); + } + set_per_buffer_default (PER_BUFFER_VAR_OFFSET (undo_list), Qunbound); /* real setup is done in bindings.el */ bset_mode_line_format (&buffer_defaults, build_pure_c_string ("%-")); @@ -5248,13 +5106,6 @@ init_buffer_once (void) bset_selective_display_ellipses (&buffer_defaults, Qt); bset_abbrev_table (&buffer_defaults, Qnil); bset_display_table (&buffer_defaults, Qnil); - bset_undo_list (&buffer_defaults, Qnil); - bset_mark_active (&buffer_defaults, Qnil); - bset_file_format (&buffer_defaults, Qnil); - bset_auto_save_file_format (&buffer_defaults, Qt); - set_buffer_overlays_before (&buffer_defaults, NULL); - set_buffer_overlays_after (&buffer_defaults, NULL); - buffer_defaults.overlay_center = BEG; XSETFASTINT (BVAR_DIRECT (&buffer_defaults, tab_width), 8); bset_truncate_lines (&buffer_defaults, Qnil); @@ -5268,13 +5119,10 @@ init_buffer_once (void) bset_extra_line_spacing (&buffer_defaults, Qnil); bset_cursor_in_non_selected_windows (&buffer_defaults, Qt); - bset_enable_multibyte_characters (&buffer_defaults, Qt); bset_buffer_file_coding_system (&buffer_defaults, Qnil); XSETFASTINT (BVAR_DIRECT (&buffer_defaults, fill_column), 70); XSETFASTINT (BVAR_DIRECT (&buffer_defaults, left_margin), 0); bset_cache_long_scans (&buffer_defaults, Qt); - bset_file_truename (&buffer_defaults, Qnil); - XSETFASTINT (BVAR_DIRECT (&buffer_defaults, display_count), 0); XSETFASTINT (BVAR_DIRECT (&buffer_defaults, left_margin_cols), 0); XSETFASTINT (BVAR_DIRECT (&buffer_defaults, right_margin_cols), 0); bset_left_fringe_width (&buffer_defaults, Qnil); @@ -5290,15 +5138,6 @@ init_buffer_once (void) bset_fringe_cursor_alist (&buffer_defaults, Qnil); bset_scroll_up_aggressively (&buffer_defaults, Qnil); bset_scroll_down_aggressively (&buffer_defaults, Qnil); - bset_display_time (&buffer_defaults, Qnil); - - /* Assign the local-flags to the slots that have default values. - The local flag is a bit that is used in the buffer - to say that it has its own local value for the slot. - The local flag bits are in the local_var_flags slot of the buffer. */ - - /* Nothing can work if this isn't true. */ - { verify (sizeof (EMACS_INT) == word_size); } Vbuffer_alist = Qnil; current_buffer = 0; @@ -5316,6 +5155,26 @@ init_buffer_once (void) DEFSYM (Qkill_buffer_hook, "kill-buffer-hook"); Fput (Qkill_buffer_hook, Qpermanent_local, Qt); + /* Sanity check that we didn't set the default for slots which + are permanent-buffer-locals. */ + eassert (EQ (BVAR (&buffer_defaults, filename), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, directory), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, backed_up), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, save_length), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, auto_save_file_name), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, read_only), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, mode_name), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, undo_list), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, mark_active), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, point_before_scroll), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, file_truename), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, invisibility_spec), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, file_format), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, auto_save_file_format), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, display_count), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, display_time), Qunbound)); + eassert (EQ (BVAR (&buffer_defaults, enable_multibyte_characters), Qunbound)); + /* Super-magic invisible buffer. */ Vprin1_to_string_buffer = Fget_buffer_create (build_pure_c_string (" prin1")); Vbuffer_alist = Qnil; @@ -5440,11 +5299,6 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring, sym->u.s.redirect = SYMBOL_FORWARDED; SET_SYMBOL_FWD (sym, bo_fwd); XSETSYMBOL (PER_BUFFER_SYMBOL (offset), sym); - - if (PER_BUFFER_IDX (offset) == 0) - /* Did a DEFVAR_PER_BUFFER without initializing the corresponding - slot of buffer_local_flags. */ - emacs_abort (); } diff --git a/src/buffer.h b/src/buffer.h index ef44da0787..0186783e39 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1112,26 +1112,11 @@ BUFFER_CHECK_INDIRECTION (struct buffer *b) that have special slots in each buffer. The default value occupies the same slot in this structure as an individual buffer's value occupies in that buffer. -*/ + Slots in this structure which are set to Qunbound are permanently + buffer-local. */ extern struct buffer buffer_defaults; -/* This structure marks which slots in a buffer have corresponding - default values in buffer_defaults. - Each such slot has a nonzero value in this structure. - The value has only one nonzero bit. - - When a buffer has its own local value for a slot, - the entry for that slot (found in the same slot in this structure) - is turned on in the buffer's local_flags array. - - If a slot in this structure is zero, then even though there may - be a Lisp-level local variable for the slot, it has no default value, - and the corresponding slot in buffer_defaults is not used. */ - - -extern struct buffer buffer_local_flags; - /* For each buffer slot, this points to the Lisp symbol name for that slot in the current buffer. It is 0 for slots that don't have such names. */ @@ -1404,43 +1389,6 @@ OVERLAY_POSITION (Lisp_Object p) offset <= PER_BUFFER_VAR_OFFSET (cursor_in_non_selected_windows); \ offset += word_size) -/* Return the index of buffer-local variable VAR. Each per-buffer - variable has an index > 0 associated with it, except when it always - has buffer-local values, in which case the index is -1. If this is - 0, this is a bug and means that the slot of VAR in - buffer_local_flags wasn't initialized. */ - -#define PER_BUFFER_VAR_IDX(VAR) \ - PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR)) - -extern bool valid_per_buffer_idx (int); - -/* Return the index value of the per-buffer variable at offset OFFSET - in the buffer structure. - - If the slot OFFSET has a corresponding default value in - buffer_defaults, the index value is positive and has only one - nonzero bit. When a buffer has its own local value for a slot, the - bit for that slot (found in the same slot in this structure) is - turned on in the buffer's local_flags array. - - If the index value is -1, even though there may be a - DEFVAR_PER_BUFFER for the slot, there is no default value for it; - and the corresponding slot in buffer_defaults is not used. - - If the index value is -2, then there is no DEFVAR_PER_BUFFER for - the slot, but there is a default value which is copied into each - new buffer. - - If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is - zero, that is a bug. */ - -INLINE int -PER_BUFFER_IDX (ptrdiff_t offset) -{ - return XFIXNUM (*(Lisp_Object *) (offset + (char *) &buffer_local_flags)); -} - /* Functions to get and set default value of the per-buffer variable at offset OFFSET in the buffer structure. */ @@ -1478,7 +1426,7 @@ set_per_buffer_value (struct buffer *b, int offset, Lisp_Object value) INLINE bool BUFFER_DEFAULT_VALUE_P (int offset) { - return PER_BUFFER_IDX (offset) > 0; + return !EQ (per_buffer_default (offset), Qunbound); } /* Value is true if the variable with offset OFFSET has a local value diff --git a/src/data.c b/src/data.c index 2e466ad207..3db235dd77 100644 --- a/src/data.c +++ b/src/data.c @@ -1600,7 +1600,6 @@ default_value (Lisp_Object symbol) if (BUFFER_OBJFWDP (valcontents)) { int offset = XBUFFER_OBJFWD (valcontents)->offset; - eassert (PER_BUFFER_IDX (offset) != 0); return per_buffer_default (offset); } -- 2.28.0