From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Wilhelm Kirschbaum Newsgroups: gmane.emacs.bugs Subject: bug#64275: 30.0.50; [PATCH] Improve sigil font-lock match for elixir-ts-mode Date: Sun, 25 Jun 2023 11:00:44 +0200 Message-ID: <87y1k7j4ov.fsf@gmail.com> References: <87zg4od38w.fsf@gmail.com> <87ttuvorbw.fsf@epfl.ch> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19862"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.9.3; emacs 30.0.50 Cc: 64275@debbugs.gnu.org To: Basil Contovounesios Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jun 25 11:03:28 2023 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 1qDLea-00052T-Em for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 25 Jun 2023 11:03:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDLeC-0008BD-GU; Sun, 25 Jun 2023 05:03:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDLeA-0008B0-PE for bug-gnu-emacs@gnu.org; Sun, 25 Jun 2023 05:03:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDLeA-0000Bh-Gd for bug-gnu-emacs@gnu.org; Sun, 25 Jun 2023 05:03:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDLeA-00077O-5K for bug-gnu-emacs@gnu.org; Sun, 25 Jun 2023 05:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Wilhelm Kirschbaum Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Jun 2023 09:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64275 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64275-submit@debbugs.gnu.org id=B64275.168768372727248 (code B ref 64275); Sun, 25 Jun 2023 09:03:02 +0000 Original-Received: (at 64275) by debbugs.gnu.org; 25 Jun 2023 09:02:07 +0000 Original-Received: from localhost ([127.0.0.1]:42013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDLdH-00075Q-AO for submit@debbugs.gnu.org; Sun, 25 Jun 2023 05:02:07 -0400 Original-Received: from mail-wr1-f43.google.com ([209.85.221.43]:52492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDLdC-00074d-1g for 64275@debbugs.gnu.org; Sun, 25 Jun 2023 05:02:05 -0400 Original-Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3128fcd58f3so2655399f8f.1 for <64275@debbugs.gnu.org>; Sun, 25 Jun 2023 02:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687683716; x=1690275716; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=7oVJWTWgFsBRZk2Dkwt6rlOlesTvgEYAXR1C/BAqWI0=; b=i341RMjZ1fbADX48DOIc88HNKGU8zP9gIbacWjehd0+VDcXIvSH+8wqbpXQEXLOlYx 3HdMV5D4pEDlAeXjkpM5z0FggTj810wWjbKMriGjM9i4RMEoki1PqivJ+liP1RzNe9Yi /OyM8F6JrQ+uTFN/W+1zWID5XEV105aMK04cJlHOWfeYQWlz7A5bzLtqHUp68DssV65b ljCpGGO1lZnDWlSGGiU8AQyIVXkAklRLibB7RZshgKj/KekZXzphzUGe8c+IEcaOaB6Z 3Lw/NGh2zXw+UXO6Tdr0M2Vo5qxHSh7JK07iLXWDUTB8ok0ipVdgWxxUXwsWU2vR7kiJ XTtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687683716; x=1690275716; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7oVJWTWgFsBRZk2Dkwt6rlOlesTvgEYAXR1C/BAqWI0=; b=i90Qq8f1BKclhmuA6VCUu2aWW9actotB7fCSGVtEtXlAHwTRjdFPjt8CURXsUs3xIX xpy6wjMsruLvWW4NHolncZpg/BaZIES+csV5WHbYToENUVi1hLl5Jip5rSV26ELsYIvh TIqy9RnbzrTEMW2RVURJcOKCGt0D+TaiW2q7enLK6HdUEnDCbtS4p5EM8CSZOZQhB6Um ZOn1s1FTEW0PaQyJ+a9z1921gokjOMOmKAr5Dtf1VoGMykDdKcuYULx15kSBiXbCPmki BDDPFDnsXRvpurbePrs4ZYcZcK8dzMc9XJGv4IB1Nm4YS/mqDyfPagGZouC4aPDP/3/k tuKQ== X-Gm-Message-State: AC+VfDyyfWewPskzoieSUyAu9QtDg+E0E+6DhjidpiswJE1niKds3HQT aPohyCuggzg5xYNxMcoRaeZ+l5Zh9z2V1w== X-Google-Smtp-Source: ACHHUZ4Q6zHtTN1j1tmf60uvjcskjjWITLSlLFeu3HYHmFKhrQWYgRTG2Tfh9hd9QDAoj5ygSLHTXg== X-Received: by 2002:adf:e910:0:b0:30a:d8f3:3e41 with SMTP id f16-20020adfe910000000b0030ad8f33e41mr20232534wrm.7.1687683715815; Sun, 25 Jun 2023 02:01:55 -0700 (PDT) Original-Received: from melissa.local (ec2-13-245-180-173.af-south-1.compute.amazonaws.com. [13.245.180.173]) by smtp.gmail.com with ESMTPSA id v1-20020adfe281000000b00311299df211sm4058159wri.77.2023.06.25.02.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 02:01:55 -0700 (PDT) In-reply-to: <87ttuvorbw.fsf@epfl.ch> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:264035 Archived-At: --=-=-= Content-Type: text/plain; format=flowed > Looks like the patch from bug#64274 was attached instead. Ah, sorry. Here is the correct patch. Wilhelm --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Update-sigil-font-lock-match-for-elixir-ts-mode.patch >From 20dd06d1cac05e775ce9f143550483cd2ad1a9ee Mon Sep 17 00:00:00 2001 From: Wilhelm H Kirschbaum Date: Mon, 22 May 2023 08:53:24 +0200 Subject: [PATCH 1/3] Update sigil font-lock match for elixir-ts-mode There is no need to match on specific sigils, except for regex. * lisp/progmodes/elixir-ts-mode.el (elixir-ts--font-lock-settings): Update sigil match. --- lisp/progmodes/elixir-ts-mode.el | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el index 7175fe4bff8..54b9740858f 100644 --- a/lisp/progmodes/elixir-ts-mode.el +++ b/lisp/progmodes/elixir-ts-mode.el @@ -458,21 +458,11 @@ elixir-ts--font-lock-settings :feature 'elixir-sigil :override t `((sigil - (sigil_name) @elixir-ts-font-sigil-name-face - (:match "^[sSwWpPUD]$" @elixir-ts-font-sigil-name-face)) - @font-lock-string-face - (sigil "~" @font-lock-string-face (sigil_name) @elixir-ts-font-sigil-name-face (:match "^[rR]$" @elixir-ts-font-sigil-name-face)) @font-lock-regexp-face - (sigil - "~" @font-lock-string-face - (sigil_name) @elixir-ts-font-sigil-name-face - quoted_start: _ @font-lock-string-face - quoted_end: _ @font-lock-string-face - (:match "^[HF]$" @elixir-ts-font-sigil-name-face))) - + (sigil) @font-lock-string-face) :language 'elixir :feature 'elixir-string-escape :override t -- 2.41.0 --=-=-=--