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 7/7] Remove unnecessary Qunbound check Date: Tue, 23 Mar 2021 23:11:57 -0400 Message-ID: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29520"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh , Eli Zaretskii , Stefan Monnier To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Mar 24 04:18:48 2021 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 1lOu2i-0007bk-If for ged-emacs-devel@m.gmane-mx.org; Wed, 24 Mar 2021 04:18:48 +0100 Original-Received: from localhost ([::1]:33508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOu2h-0004t0-Iy for ged-emacs-devel@m.gmane-mx.org; Tue, 23 Mar 2021 23:18:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOtwR-0006C8-37 for emacs-devel@gnu.org; Tue, 23 Mar 2021 23:12:19 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:45442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOtwP-0000ll-3h; Tue, 23 Mar 2021 23:12:18 -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=1616555530; bh=sbR8n7yTkqw8UzaQ/USwtk1GOrUIjkJ55uXymIvEBAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j9xa33xlO3optbLwpKoPTaMyOHfVPcYH5HHin2Tom909KkhlPawzOIahAKy7OySBb Jj8eSgwxiAqbSz27oaPfw0pl/PtpK3jCGkpl+znJAF0s4FJ0dGJNdQwPX9wyyaS079 nxHVZ81RANcdTWeUMNEwYZ2PMO4Ecji+R4DKZD88= 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 B09F72E6700; Wed, 24 Mar 2021 03:12:10 +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:266912 Archived-At: DEFVAR_PER_BUFFER variables (which this function deals with) cannot be Qunbound, at least right now; they're either set to a value, or PER_BUFFER_VALUE_P is false. * src/buffer.c (buffer_local_variables_1): Remove Qunbound check --- src/buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 563e5b7180..a1555c729c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1323,8 +1323,7 @@ buffer_local_variables_1 (struct buffer *buf, int offset, Lisp_Object sym) && SYMBOLP (PER_BUFFER_SYMBOL (offset))) { sym = NILP (sym) ? PER_BUFFER_SYMBOL (offset) : sym; - Lisp_Object val = per_buffer_value (buf, offset); - return EQ (val, Qunbound) ? sym : Fcons (sym, val); + return Fcons (sym, per_buffer_value (buf, offset)); } return Qnil; } -- 2.28.0