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 02/10] Add bset_save_length and use it Date: Thu, 19 Nov 2020 10:38:06 -0500 Message-ID: <20201119153814.17541-3-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="1714"; 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:42:13 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 1kfm4a-0000KY-Tn for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 16:42:12 +0100 Original-Received: from localhost ([::1]:55874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfm4a-0001hx-0W for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 10:42:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfm0q-0005Ii-3g for emacs-devel@gnu.org; Thu, 19 Nov 2020 10:38:20 -0500 Original-Received: from venus.catern.com ([68.183.49.163]:54658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfm0o-0000cD-0L for emacs-devel@gnu.org; Thu, 19 Nov 2020 10:38:19 -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=1605800297; bh=fMbMgY4XkE00kQmOruqpTBMUxiEcqcwXO2OBe9JYBIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CoIlOve7WwNAUOPYrDmhv60DNdwplgqeXxlQ5mcEMT9G598uoB8Lzbb3xUcb4uAmf 0ND6P7epzT6OBU+YjkTzm1zJz5dNeA5mV5Rc9wGPvI14t/zNumfFAFRFgcpTci6RIu cuNRnjJ8Ny1mdPTN3cfYkj6uXADajWK1fsv2f+RA= 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 736982DDAB1; Thu, 19 Nov 2020 15:38:17 +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:259434 Archived-At: This removes some usage of BVAR as an lvalue, necessary for changing BVAR into a function call. --- src/buffer.c | 9 ++------- src/buffer.h | 5 +++++ src/fileio.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 64d0a74fb0..e88bf23fad 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -332,11 +332,6 @@ bset_right_fringe_width (struct buffer *b, Lisp_Object val) b->right_fringe_width_ = val; } static void -bset_save_length (struct buffer *b, Lisp_Object val) -{ - b->save_length_ = val; -} -static void bset_scroll_bar_width (struct buffer *b, Lisp_Object val) { b->scroll_bar_width_ = val; @@ -956,7 +951,7 @@ reset_buffer (register struct buffer *b) bset_directory (b, current_buffer ? BVAR (current_buffer, directory) : Qnil); b->modtime = make_timespec (0, UNKNOWN_MODTIME_NSECS); b->modtime_size = -1; - XSETFASTINT (BVAR (b, save_length), 0); + bset_save_length (b, make_fixed_natnum (0)); b->last_window_start = 1; /* It is more conservative to start out "changed" than "unchanged". */ b->clip_changed = 0; @@ -2282,7 +2277,7 @@ so the buffer is truly empty after this. */) /* Prevent warnings, or suspension of auto saving, that would happen if future size is less than past size. Use of erase-buffer implies that the future text is not really related to the past text. */ - XSETFASTINT (BVAR (current_buffer, save_length), 0); + bset_save_length (current_buffer, make_fixed_natnum (0)); return Qnil; } diff --git a/src/buffer.h b/src/buffer.h index 3da49414bb..690593757e 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -824,6 +824,11 @@ bset_width_table (struct buffer *b, Lisp_Object val) { b->width_table_ = val; } +INLINE void +bset_save_length (struct buffer *b, Lisp_Object val) +{ + b->save_length_ = val; +} /* BUFFER_CEILING_OF (resp. BUFFER_FLOOR_OF), when applied to n, return the max (resp. min) p such that diff --git a/src/fileio.c b/src/fileio.c index 283813ff89..ba094a5705 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4697,7 +4697,7 @@ by calling `format-decode', which see. */) SAVE_MODIFF = MODIFF; BUF_AUTOSAVE_MODIFF (current_buffer) = MODIFF; - XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); + bset_save_length (current_buffer, make_fixed_natnum (Z - BEG)); if (NILP (handler)) { if (!NILP (BVAR (current_buffer, file_truename))) @@ -5110,7 +5110,7 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename, if (visiting) { SAVE_MODIFF = MODIFF; - XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); + bset_save_length (current_buffer, make_fixed_natnum (Z - BEG)); bset_filename (current_buffer, visit_file); } @@ -5361,7 +5361,7 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename, if (visiting) { SAVE_MODIFF = MODIFF; - XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); + bset_save_length (current_buffer, make_fixed_natnum (Z - BEG)); bset_filename (current_buffer, visit_file); update_mode_lines = 14; if (auto_saving_into_visited_file) @@ -5979,7 +5979,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) minibuffer_auto_raise = 0; /* Turn off auto-saving until there's a real save, and prevent any more warnings. */ - XSETINT (BVAR (b, save_length), -1); + bset_save_length (current_buffer, make_fixed_natnum (-1)); Fsleep_for (make_fixnum (1), Qnil); continue; } @@ -5988,7 +5988,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) internal_condition_case (auto_save_1, Qt, auto_save_error); auto_saved = 1; BUF_AUTOSAVE_MODIFF (b) = BUF_MODIFF (b); - XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); + bset_save_length (current_buffer, make_fixed_natnum (Z - BEG)); set_buffer_internal (old); after_time = current_timespec (); @@ -6034,7 +6034,7 @@ No auto-save file will be written until the buffer changes again. */) /* FIXME: This should not be called in indirect buffers, since they're not autosaved. */ BUF_AUTOSAVE_MODIFF (current_buffer) = MODIFF; - XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); + bset_save_length (current_buffer, make_fixed_natnum (Z - BEG)); current_buffer->auto_save_failure_time = 0; return Qnil; } -- 2.28.0