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.bugs Subject: bug#48264: [PATCH v4 01/14] Stop checking the constant default for enable_multibyte_characters Date: Fri, 7 May 2021 22:08:52 -0400 Message-ID: <20210508020905.13583-3-sbaugh@catern.com> References: <20210506213346.9730-1-sbaugh@catern.com> <20210508020905.13583-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="24354"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh To: 48264@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 08 04:45:22 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1lfCy1-0006EF-OG for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 08 May 2021 04:45:21 +0200 Original-Received: from localhost ([::1]:34226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfCy0-0002Nh-LU for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 07 May 2021 22:45:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfCPr-0001JE-Gt for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfCPr-0007WC-4U for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfCPq-0006UU-WD for bug-gnu-emacs@gnu.org; Fri, 07 May 2021 22:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 08 May 2021 02:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48264 X-GNU-PR-Package: emacs Original-Received: via spool by 48264-submit@debbugs.gnu.org id=B48264.162043975924768 (code B ref 48264); Sat, 08 May 2021 02:10:02 +0000 Original-Received: (at 48264) by debbugs.gnu.org; 8 May 2021 02:09:19 +0000 Original-Received: from localhost ([127.0.0.1]:47149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfCP8-0006RJ-PX for submit@debbugs.gnu.org; Fri, 07 May 2021 22:09:19 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:47888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfCP4-0006Qf-RT for 48264@debbugs.gnu.org; Fri, 07 May 2021 22:09:15 -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=1620439754; bh=h2sPxarE55m0+XsTg2l0mSbveap4YbIvUYTJNHbCHBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KTLrlcIyqy6w5CgE+A83eqq5CRqxhv/iEYL8u4yZZvLKqkIFdk1ZvjsbWam32BKTh gXPsqrXAnKX8mdvSMZdYqOrSwzAR/2WBv2drpIFU43FRxa6/aaAsu3O/74QhFSCaRJ bGpq74IWg2gtFfL2U8ciMFioBw9VFxSrWAcHoqcc= 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 8DDE52E982B; Sat, 8 May 2021 02:09:14 +0000 (UTC) X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210508020905.13583-1-sbaugh@catern.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:205971 Archived-At: The default is a constant "t", and can't be changed. So we don't need to check it. This makes enable_multibyte_characters like every other permanently buffer-local variable defined with DEFVAR_PER_BUFFER. * src/buffer.c (reset_buffer, init_buffer): * src/print.c (print_string, temp_output_buffer_setup): * src/process.c (Fmake_pipe_process, Fmake_serial_process) (set_network_socket_coding_system): Don't check buffer_defaults for enable_multibyte_characters. --- src/buffer.c | 5 +---- src/print.c | 6 ++---- src/process.c | 15 ++++----------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 8e33162989..8b3e15bc81 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -988,8 +988,7 @@ reset_buffer (register struct buffer *b) bset_last_selected_window (b, Qnil); bset_display_count (b, make_fixnum (0)); bset_display_time (b, Qnil); - bset_enable_multibyte_characters - (b, BVAR (&buffer_defaults, enable_multibyte_characters)); + bset_enable_multibyte_characters (b, Qt); bset_cursor_type (b, BVAR (&buffer_defaults, cursor_type)); bset_extra_line_spacing (b, BVAR (&buffer_defaults, extra_line_spacing)); @@ -5406,8 +5405,6 @@ init_buffer (void) AUTO_STRING (scratch, "*scratch*"); Fset_buffer (Fget_buffer_create (scratch, Qnil)); - if (NILP (BVAR (&buffer_defaults, enable_multibyte_characters))) - Fset_buffer_multibyte (Qnil); char const *pwd = emacs_wd; diff --git a/src/print.c b/src/print.c index d4301fd7b6..653f17aa1d 100644 --- a/src/print.c +++ b/src/print.c @@ -453,8 +453,7 @@ print_string (Lisp_Object string, Lisp_Object printcharfun) chars = SCHARS (string); else if (! print_escape_nonascii && (EQ (printcharfun, Qt) - ? ! NILP (BVAR (&buffer_defaults, enable_multibyte_characters)) - : ! NILP (BVAR (current_buffer, enable_multibyte_characters)))) + || ! NILP (BVAR (current_buffer, enable_multibyte_characters)))) { /* If unibyte string STRING contains 8-bit codes, we must convert STRING to a multibyte string containing the same @@ -572,8 +571,7 @@ temp_output_buffer_setup (const char *bufname) bset_undo_list (current_buffer, Qt); eassert (current_buffer->overlays_before == NULL); eassert (current_buffer->overlays_after == NULL); - bset_enable_multibyte_characters - (current_buffer, BVAR (&buffer_defaults, enable_multibyte_characters)); + bset_enable_multibyte_characters (current_buffer, Qt); specbind (Qinhibit_read_only, Qt); specbind (Qinhibit_modification_hooks, Qt); Ferase_buffer (); diff --git a/src/process.c b/src/process.c index 84e301a87a..44ba6c578e 100644 --- a/src/process.c +++ b/src/process.c @@ -2399,8 +2399,7 @@ usage: (make-pipe-process &rest ARGS) */) } else if (!NILP (Vcoding_system_for_read)) val = Vcoding_system_for_read; - else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) - || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) + else if (!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) /* We dare not decode end-of-line format by setting VAL to Qraw_text, because the existing Emacs Lisp libraries assume that they receive bare code including a sequence of @@ -2425,8 +2424,6 @@ usage: (make-pipe-process &rest ARGS) */) } else if (!NILP (Vcoding_system_for_write)) val = Vcoding_system_for_write; - else if (NILP (BVAR (current_buffer, enable_multibyte_characters))) - val = Qnil; else { if (CONSP (coding_systems)) @@ -3124,8 +3121,7 @@ usage: (make-serial-process &rest ARGS) */) } else if (!NILP (Vcoding_system_for_read)) val = Vcoding_system_for_read; - else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) - || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) + else if (!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) val = Qnil; pset_decode_coding_system (p, val); @@ -3138,8 +3134,7 @@ usage: (make-serial-process &rest ARGS) */) } else if (!NILP (Vcoding_system_for_write)) val = Vcoding_system_for_write; - else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) - || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) + else if (!NILP (buffer) && NILP (BVAR (XBUFFER (buffer), enable_multibyte_characters))) val = Qnil; pset_encode_coding_system (p, val); @@ -3181,9 +3176,7 @@ set_network_socket_coding_system (Lisp_Object proc, Lisp_Object host, else if (!NILP (Vcoding_system_for_read)) val = Vcoding_system_for_read; else if ((!NILP (p->buffer) - && NILP (BVAR (XBUFFER (p->buffer), enable_multibyte_characters))) - || (NILP (p->buffer) - && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) + && NILP (BVAR (XBUFFER (p->buffer), enable_multibyte_characters)))) /* We dare not decode end-of-line format by setting VAL to Qraw_text, because the existing Emacs Lisp libraries assume that they receive bare code including a sequence of -- 2.31.1