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 05/10] Add BVAR_DEFAULT for access to buffer defaults Date: Thu, 19 Nov 2020 10:38:09 -0500 Message-ID: <20201119153814.17541-6-sbaugh@catern.com> References: <87mtzil519.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="24053"; 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 Thu Nov 19 16:46:39 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 1kfm8s-00068N-Q9 for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 16:46:38 +0100 Original-Received: from localhost ([::1]:42264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfm8r-0007yM-NQ for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 10:46:37 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfm0s-0005KH-2Y for emacs-devel@gnu.org; Thu, 19 Nov 2020 10:38:22 -0500 Original-Received: from venus.catern.com ([68.183.49.163]:54688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfm0q-0000dn-0J for emacs-devel@gnu.org; Thu, 19 Nov 2020 10:38:21 -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=1605800298; bh=C7H3octzbm11RhBiRo1n+04B+7zOdegFLGnTHkWkVrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AD7fJXt+W70AbunohAeLsCSf89mbQKEUZXpgCkYBdyHZWVLgMTyqP5mYDT+TbSM67 hVUjvxIAvAy5iNQSzGR2Y9sx7osNX7Fon5JlYd/RV6sJqekTsW+kOlMbZAx0hI7G9h bgh6aXRZ9empwldO3dOnVWMvRnfnv9F7lgj7T43Y= 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 7B2132DDAB4; Thu, 19 Nov 2020 15:38:18 +0000 (UTC) X-Mailer: git-send-email 2.28.0 In-Reply-To: <87mtzil519.fsf@catern.com> Received-SPF: pass client-ip=68.183.49.163; envelope-from=sbaugh@catern.com; helo=venus.catern.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/19 09:22:08 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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:259438 Archived-At: This is more direct. This macro can stay as an lvalue even when we change BVAR to be a function call - directly changing and accessing buffer_defaults is always fine. --- src/buffer.h | 3 +++ src/category.h | 2 +- src/syntax.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/buffer.h b/src/buffer.h index 690593757e..0b26c56e89 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -284,6 +284,9 @@ struct buffer_text #define BVAR(buf, field) ((buf)->field ## _) +/* Access a BVAR from buffer_defaults */ +#define BVAR_DEFAULT(field) (buffer_defaults.field ## _) + /* Max number of builtin per-buffer variables. */ enum { MAX_PER_BUFFER_VARS = 50 }; diff --git a/src/category.h b/src/category.h index cc32990478..85e872a940 100644 --- a/src/category.h +++ b/src/category.h @@ -94,7 +94,7 @@ CHAR_HAS_CATEGORY (int ch, int category) /* The standard category table is stored where it will automatically be used in all new buffers. */ -#define Vstandard_category_table BVAR (&buffer_defaults, category_table) +#define Vstandard_category_table BVAR_DEFAULT (category_table) /* Return the doc string of CATEGORY in category table TABLE. */ #define CATEGORY_DOCSTRING(table, category) \ diff --git a/src/syntax.h b/src/syntax.h index a2ec3301ba..9c2bf32057 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -31,7 +31,7 @@ extern void update_syntax_table_forward (ptrdiff_t, bool, Lisp_Object); /* The standard syntax table is stored where it will automatically be used in all new buffers. */ -#define Vstandard_syntax_table BVAR (&buffer_defaults, syntax_table) +#define Vstandard_syntax_table BVAR_DEFAULT (syntax_table) /* A syntax table is a chartable whose elements are cons cells (CODE+FLAGS . MATCHING-CHAR). MATCHING-CHAR can be nil if the char -- 2.28.0