From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24603: [PATCHv5 07/11] Introduce =?UTF-8?Q?=E2=80=98buffer-language=E2=80=99?= buffer-locar variable Date: Thu, 9 Mar 2017 22:51:46 +0100 Message-ID: <20170309215150.9562-8-mina86@mina86.com> References: <20170309215150.9562-1-mina86@mina86.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1489096468 19805 195.159.176.226 (9 Mar 2017 21:54:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2017 21:54:28 +0000 (UTC) To: 24603@debbugs.gnu.org, eliz@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 09 22:54:23 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm60j-0003tC-KQ for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 22:54:13 +0100 Original-Received: from localhost ([::1]:36410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm60o-0003ag-D0 for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 16:54:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm5zq-0002oE-42 for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cm5zm-0004MC-NO for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:18 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49933) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cm5zm-0004Lm-J7 for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:14 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cm5ze-0000Q8-Sp for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:06 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 09 Mar 2017 21:53:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24603 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24603-submit@debbugs.gnu.org id=B24603.14890963421485 (code B ref 24603); Thu, 09 Mar 2017 21:53:06 +0000 Original-Received: (at 24603) by debbugs.gnu.org; 9 Mar 2017 21:52:22 +0000 Original-Received: from localhost ([127.0.0.1]:48124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yw-0000Nr-Av for submit@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:22 -0500 Original-Received: from mail-wr0-f175.google.com ([209.85.128.175]:36839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yq-0000M5-C2 for 24603@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:18 -0500 Original-Received: by mail-wr0-f175.google.com with SMTP id u108so53787005wrb.3 for <24603@debbugs.gnu.org>; Thu, 09 Mar 2017 13:52:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qz14Di4tds9kNOvlt6N+dqNczMpbzmdAYYt4QYc+zcQ=; b=qT2Dce0OL08TndXoZxLKRAtJXtkGcBPdr+a3dcm1lM+dn7Ot5IfVELwUsMUJgJhkgM BaoV2OD+5KqpnZfnj1+JmyBk1wghu6Dnz6Td6lKbwXIaxMozZP8GQl0mIdykTGOsdSrR kT7Lp5HB+5h6R0AmZCd4EbwfpFqjPYgYMkt6f54RPw7Bf+whoHYRsEFwHbgEVHmVORJb lXbAvX8FSZK+z9XjvscMl39xtP7n0/HS3BbPMeoR/gFIuuD8qlh/mAQrqVLqKb3D/FQA Ka5EEqYv3mi9qnwWI9RwxFce6EZux6XC2mWZw04oAiNhOIe6WGVDrkq2eIE8OhXFkf+H 7mQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qz14Di4tds9kNOvlt6N+dqNczMpbzmdAYYt4QYc+zcQ=; b=J7kfsL4EL7QSq3U3c/vYB+2GnVfxAhb+6FNGnfssp36278d8Bc79EHYH5m2fde1M0Q EA8aZXYnhyxKbduF0P6gIEFx/956vyH4acwxrPOX54KPX6gi8GdDCg8jUDrV0ZTYI3N2 JAB12lYE8z+7kQ9jKarBGeWfwvl+QsHnwRgYUEsxZNmrVsiKDEIU/b1fZzzPRcLqKqXb yh0/K86R5c6IfQhUlMU3RWhThEC+1ofRmX8eLbBsLCtT/yK1JThgNTLdFJNSxzX1yEnx WAcp4bJdUkrBfFp1KgPTW6MjESUR0PaF8mvSTs1GCh4HYBuAln8klnLFhJxRgTmZgJnU 2KEw== X-Gm-Message-State: AMke39m8lYkTrBRhGMzPHtviu/fLT3uQarsxmEn5ihWhHgEyJBuxr2GATMdddE0LSv0H5fv5 X-Received: by 10.223.133.182 with SMTP id 51mr13195380wrt.39.1489096330468; Thu, 09 Mar 2017 13:52:10 -0800 (PST) Original-Received: from mpn.zrh.corp.google.com ([172.16.115.43]) by smtp.gmail.com with ESMTPSA id i203sm281675wmf.12.2017.03.09.13.52.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 13:52:05 -0800 (PST) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id BE8B41E0277; Thu, 9 Mar 2017 22:51:58 +0100 (CET) X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170309215150.9562-1-mina86@mina86.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:130402 Archived-At: At the time unused, ‘buffer-language’ variable denotes the language buffer is in. * src/buffer.h (struct buffer): New ‘buffer-language’ buffer-local variable. * lisp/international/mule-cmds.el (set-locale-environment): Set ‘buffer-language’ on locale change. --- lisp/international/mule-cmds.el | 8 ++++++-- src/buffer.c | 8 ++++++++ src/buffer.h | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index bdba8eeb112..d883e8c2298 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2601,7 +2601,7 @@ set-locale-environment (setq system-messages-locale locale) (setq system-time-locale locale)) - (if (string-match "^[a-z][a-z]" locale) + (when (string-match "^[a-z][a-z]" locale) ;; The value of 'current-iso639-language' is matched against ;; the ':lang' property of font-spec objects when selecting ;; and prioritizing available fonts for displaying @@ -2613,7 +2613,11 @@ set-locale-environment ;; match mentioned above uses memq, and ':lang' ;; properties have lower-case values, the letter-case ;; must match exactly. - (intern (downcase (match-string 0 locale)))))) + (intern (downcase (match-string 0 locale)))) + + ;; ‘buffer-language’ is used to identify language buffer is in for the + ;; purpose of performing language-specific operations. + (setq-default buffer-language locale))) (setq woman-locale (or system-messages-locale diff --git a/src/buffer.c b/src/buffer.c index c00cc40d6f2..7a56ace20d9 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -934,6 +934,7 @@ reset_buffer (register struct buffer *b) bset_display_time (b, Qnil); bset_enable_multibyte_characters (b, BVAR (&buffer_defaults, enable_multibyte_characters)); + bset_language (b, BVAR (&buffer_defaults, language)); bset_cursor_type (b, BVAR (&buffer_defaults, cursor_type)); bset_extra_line_spacing (b, BVAR (&buffer_defaults, extra_line_spacing)); @@ -5113,6 +5114,7 @@ init_buffer_once (void) XSETFASTINT (BVAR (&buffer_local_flags, scroll_up_aggressively), idx); ++idx; XSETFASTINT (BVAR (&buffer_local_flags, scroll_down_aggressively), idx); ++idx; XSETFASTINT (BVAR (&buffer_local_flags, header_line_format), idx); ++idx; + XSETFASTINT (BVAR (&buffer_local_flags, language), idx); ++idx; XSETFASTINT (BVAR (&buffer_local_flags, cursor_type), idx); ++idx; XSETFASTINT (BVAR (&buffer_local_flags, extra_line_spacing), idx); ++idx; XSETFASTINT (BVAR (&buffer_local_flags, cursor_in_non_selected_windows), idx); ++idx; @@ -5175,6 +5177,7 @@ init_buffer_once (void) bset_ctl_arrow (&buffer_defaults, Qt); bset_bidi_display_reordering (&buffer_defaults, Qt); bset_bidi_paragraph_direction (&buffer_defaults, Qnil); + bset_language (&buffer_defaults, Qnil); bset_cursor_type (&buffer_defaults, Qt); bset_extra_line_spacing (&buffer_defaults, Qnil); bset_cursor_in_non_selected_windows (&buffer_defaults, Qt); @@ -6096,6 +6099,11 @@ and disregard a `read-only' text property if the property value is a member of the list. */); Vinhibit_read_only = Qnil; + DEFVAR_PER_BUFFER ("buffer-language", &BVAR (current_buffer, language), Qnil, + doc: /* A locale string describing what natural language text in the buffer is in. +Nil indicates the buffer does not have natural language text or the language +is not specified. */); + DEFVAR_PER_BUFFER ("cursor-type", &BVAR (current_buffer, cursor_type), Qnil, doc: /* Cursor to use when this buffer is in the selected window. Values are interpreted as follows: diff --git a/src/buffer.h b/src/buffer.h index a2bdc4e7294..d86bca888a9 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -735,6 +735,9 @@ struct buffer window. Nil means that scrolling method isn't used. */ Lisp_Object scroll_down_aggressively_; + /* A locale string describing what (natural) language current buffer is in. */ + Lisp_Object language_; + /* Desired cursor type in this buffer. See the doc string of per-buffer variable `cursor-type'. */ Lisp_Object cursor_type_; @@ -994,6 +997,11 @@ bset_undo_list (struct buffer *b, Lisp_Object val) b->undo_list_ = val; } INLINE void +bset_language (struct buffer *b, Lisp_Object val) +{ + b->language_ = val; +} +INLINE void bset_upcase_table (struct buffer *b, Lisp_Object val) { b->upcase_table_ = val; -- 2.12.0.246.ga2ecc84866-goog