From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Peter Oliver Newsgroups: gmane.emacs.bugs Subject: bug#48043: UTF-8 magic comment is unwelcome with recent Ruby versions Date: Tue, 27 Apr 2021 16:29:17 +0100 (BST) Message-ID: References: <5a8e33ff-2ca9-7125-2fac-1874a9f69900@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="-1463811583-1836946391-1619537357=:3611" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="694"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 48043@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 27 17:32:37 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 1lbPhU-000Adn-Ib for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 27 Apr 2021 17:32:36 +0200 Original-Received: from localhost ([::1]:36676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbPhS-0006M2-AY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 27 Apr 2021 11:32:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbPf0-0005d3-KO for bug-gnu-emacs@gnu.org; Tue, 27 Apr 2021 11:30:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lbPf0-0001SG-B4 for bug-gnu-emacs@gnu.org; Tue, 27 Apr 2021 11:30:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lbPf0-0005lO-4V for bug-gnu-emacs@gnu.org; Tue, 27 Apr 2021 11:30:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Peter Oliver Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Apr 2021 15:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48043 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 48043-submit@debbugs.gnu.org id=B48043.161953737122097 (code B ref 48043); Tue, 27 Apr 2021 15:30:01 +0000 Original-Received: (at 48043) by debbugs.gnu.org; 27 Apr 2021 15:29:31 +0000 Original-Received: from localhost ([127.0.0.1]:50593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbPeV-0005kK-5f for submit@debbugs.gnu.org; Tue, 27 Apr 2021 11:29:31 -0400 Original-Received: from mail-wr1-f41.google.com ([209.85.221.41]:34494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbPeP-0005k1-F2 for 48043@debbugs.gnu.org; Tue, 27 Apr 2021 11:29:29 -0400 Original-Received: by mail-wr1-f41.google.com with SMTP id t18so2325005wry.1 for <48043@debbugs.gnu.org>; Tue, 27 Apr 2021 08:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mavit.org.uk; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=CcsY4YtoVvnhfohuR1LK1TNDkXz11reMSslhdZwAIvc=; b=BUa/XgksIvTNmYGML+jLzQOsvzukMWVFMZlILZXTzr5vj2Ok3HZMs1Qxz6qqr1gCPc m23clnwUDYdb/jJbYVPYJwZrgxsTUcyaAY3PgXVappHyauVBX8P+ckePU1BTI4paVILL PKX2qcMCVUiPp8ciA2l/gHWE0xdeOAvU8MXpI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=CcsY4YtoVvnhfohuR1LK1TNDkXz11reMSslhdZwAIvc=; b=QBKaBlQ3v6D3YfgxUlaHOwDY4cHmXZ9N970GnK4LTCWr+csV209GdTVh+YuHCMsTtw CKJVo0xdII7RpphjnDmsvWFOJnkDvswcx7A4iq/So7uTAQi2X9wuVaZkQlQEBBe12UHU L3RUKbcnJ6ggG7Us0Lkbc9boSidBNGaY6EpAhpwMa/45sRUDgI5erJQXzW0nu0PZx947 P6zeixGrRo+ZK9aBSpeU0iuCyGi4/JOBshOWX0hWHIhjAGpGDqepQ0Fav1fKS9/d7Mx/ 9oj3I031OD8NAaNXYJwmCKQ9RQo3GCncMyciJKb9xzOpHdTVH6gjI8XiJtDT5KXcAJim CT+Q== X-Gm-Message-State: AOAM533YRkcPVsst0gasj6S1/O5bLnoFtA5igxoOAKk1LD792Yjc2SLp T7j7klSE6bQbAoF5JvuSfXEb3A== X-Google-Smtp-Source: ABdhPJzrs1ZXMWtOWaT21zUC4z8G32hv3kgJW1ud+mMw857uF6I2xBw0VGRvk9//RQ8NfI+Uhbv0Ow== X-Received: by 2002:a5d:6548:: with SMTP id z8mr22616388wrv.116.1619537359643; Tue, 27 Apr 2021 08:29:19 -0700 (PDT) Original-Received: from froglet.home.mavit.org.uk (cpc118948-dudl14-2-0-cust32.16-1.cable.virginm.net. [82.37.201.33]) by smtp.gmail.com with ESMTPSA id l14sm4533040wrv.94.2021.04.27.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 08:29:18 -0700 (PDT) Original-Received: from froglet.home.mavit.org.uk (localhost [127.0.0.1]) by froglet.home.mavit.org.uk (8.15.2/8.15.2) with ESMTPS id 13RFTHVO042760 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Apr 2021 16:29:17 +0100 Original-Received: from localhost (mavit@localhost) by froglet.home.mavit.org.uk (8.15.2/8.15.2/Submit) with ESMTP id 13RFTH02042755; Tue, 27 Apr 2021 16:29:17 +0100 X-Authentication-Warning: froglet.home.mavit.org.uk: mavit owned process doing -bs In-Reply-To: <5a8e33ff-2ca9-7125-2fac-1874a9f69900@yandex.ru> 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:205027 Archived-At: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. ---1463811583-1836946391-1619537357=:3611 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 27 Apr 2021, Dmitry Gutov wrote: > On 26.04.2021 21:28, Peter Oliver wrote: > >> Two patches are attached to address this: >> >> - The first patch adds a new choice to ruby-insert-encoding-magic-comment, >> unless-utf8, which causes the magic comment not to be inserted if the >> encoding is UTF-8. >> >> - The second patch, perhaps more controversially, makes this the default. > > Both changes make sense to me. > > However, I've looked at the existing code and found a prior change which > intended for this to be more customizable already, yet had a minor bug. > > Please try out the following patch: That works for me, and I think is more straightforward than my approach. Thanks. Attached is an additional patch which adapts the tests added in my patch for your patch. -- Peter Oliver ---1463811583-1836946391-1619537357=:3611 Content-Type: text/plain; charset=UTF-8; name=0001-Test-ruby-mode-set-encoding-with-a-few-different-enc.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=0001-Test-ruby-mode-set-encoding-with-a-few-different-enc.patch RnJvbSA2NzVjMDhjZWU4OTk0NDRmMzMxMTNiODA2ZDY3MDliNTY5YzQ0Nzkw IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogUGV0ZXIgT2xpdmVy IDxnaXRAbWF2aXQub3JnLnVrPg0KRGF0ZTogVHVlLCAyNyBBcHIgMjAyMSAx NjoyNDo1OCArMDEwMA0KU3ViamVjdDogW1BBVENIXSBUZXN0IHJ1YnktbW9k ZS1zZXQtZW5jb2Rpbmcgd2l0aCBhIGZldyBkaWZmZXJlbnQgZW5jb2Rpbmdz DQpNSU1FLVZlcnNpb246IDEuMA0KQ29udGVudC1UeXBlOiB0ZXh0L3BsYWlu OyBjaGFyc2V0PVVURi04DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4 Yml0DQoNCkZvbGxvd3Mgb24gZnJvbSBEbWl0cnkgR3V0b3bigJlzIHBhdGNo IGluDQpodHRwczovL2RlYmJ1Z3MuZ251Lm9yZy9jZ2kvYnVncmVwb3J0LmNn aT9idWc9NDgwNDMjOC4NCi0tLQ0KIHRlc3QvbGlzcC9wcm9nbW9kZXMvcnVi eS1tb2RlLXRlc3RzLmVsIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysr KysNCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKQ0KDQpkaWZm IC0tZ2l0IGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9ydWJ5LW1vZGUtdGVzdHMu ZWwgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS10ZXN0cy5lbA0K aW5kZXggNDJhMDExYzhiYy4uZmVjN2Q4NmE5NSAxMDA2NDQNCi0tLSBhL3Rl c3QvbGlzcC9wcm9nbW9kZXMvcnVieS1tb2RlLXRlc3RzLmVsDQorKysgYi90 ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS10ZXN0cy5lbA0KQEAgLTMy LDYgKzMyLDEyIEBAIHJ1Ynktd2l0aC10ZW1wLWJ1ZmZlcg0KICAgICAgKHJ1 YnktbW9kZSkNCiAgICAgICxAYm9keSkpDQogDQorKGRlZm1hY3JvIHJ1Ynkt d2l0aC10ZW1wLWZpbGUgKGNvbnRlbnRzICZyZXN0IGJvZHkpDQorICBgKHJ1 Ynktd2l0aC10ZW1wLWJ1ZmZlciAsY29udGVudHMNCisgICAgIChzZXQtdmlz aXRlZC1maWxlLW5hbWUgInJ1YnktbW9kZS10ZXN0cyIpDQorICAgICAsQGJv ZHkNCisgICAgIChkZWxldGUtZmlsZSBidWZmZXItZmlsZS1uYW1lKSkpDQor DQogKGRlZnVuIHJ1Ynktc2hvdWxkLWluZGVudCAoY29udGVudCBjb2x1bW4p DQogICAiQXNzZXJ0IGluZGVudGF0aW9uIENPTFVNTiBvbiB0aGUgbGFzdCBs aW5lIG9mIENPTlRFTlQuIg0KICAgKHJ1Ynktd2l0aC10ZW1wLWJ1ZmZlciBj b250ZW50DQpAQCAtODQ0LDYgKzg1MCwzMCBAQCBydWJ5LS1pbnNlcnQtY29k aW5nLWNvbW1lbnQtY3VzdG9tLXN0eWxlDQogICAgICAgKHJ1YnktLWluc2Vy dC1jb2RpbmctY29tbWVudCAidXRmLTgiKQ0KICAgICAgIChzaG91bGQgKHN0 cmluZz0gIiMgZW5jb2Rpbmc6IHV0Zi04XG5cbiIgKGJ1ZmZlci1zdHJpbmcp KSkpKSkNCiANCisoZXJ0LWRlZnRlc3QgcnVieS0tc2V0LWVuY29kaW5nLXdo ZW4tYXNjaWkgKCkNCisgIChydWJ5LXdpdGgtdGVtcC1maWxlICJhc2NpaSIN CisgICAgKGxldCAoKHJ1YnktZW5jb2RpbmctbWFnaWMtY29tbWVudC1zdHls ZSAncnVieSkNCisgICAgICAgICAgKHJ1YnktaW5zZXJ0LWVuY29kaW5nLW1h Z2ljLWNvbW1lbnQgdCkpDQorICAgICAgKHNldHEgc2F2ZS1idWZmZXItY29k aW5nLXN5c3RlbSAndXMtYXNjaWkpDQorICAgICAgKHJ1YnktbW9kZS1zZXQt ZW5jb2RpbmcpDQorICAgICAgKHNob3VsZCAoc3RyaW5nPSAiYXNjaWkiIChi dWZmZXItc3RyaW5nKSkpKSkpDQorDQorKGVydC1kZWZ0ZXN0IHJ1YnktLXNl dC1lbmNvZGluZy13aGVuLXV0ZjggKCkNCisgIChydWJ5LXdpdGgtdGVtcC1m aWxlICLwn5KOIg0KKyAgICAobGV0ICgocnVieS1lbmNvZGluZy1tYWdpYy1j b21tZW50LXN0eWxlICdydWJ5KQ0KKyAgICAgICAgICAocnVieS1pbnNlcnQt ZW5jb2RpbmctbWFnaWMtY29tbWVudCB0KSkNCisgICAgICAoc2V0cSBzYXZl LWJ1ZmZlci1jb2Rpbmctc3lzdGVtICd1dGYtOCkNCisgICAgICAocnVieS1t b2RlLXNldC1lbmNvZGluZykNCisgICAgICAoc2hvdWxkIChzdHJpbmc9ICLw n5KOIiAoYnVmZmVyLXN0cmluZykpKSkpKQ0KKw0KKyhlcnQtZGVmdGVzdCBy dWJ5LS1zZXQtZW5jb2Rpbmctd2hlbi1sYXRpbi0xNSAoKQ0KKyAgKHJ1Ynkt d2l0aC10ZW1wLWZpbGUgIuKThyINCisgICAgKGxldCAoKHJ1YnktZW5jb2Rp bmctbWFnaWMtY29tbWVudC1zdHlsZSAncnVieSkNCisgICAgICAgICAgKHJ1 YnktaW5zZXJ0LWVuY29kaW5nLW1hZ2ljLWNvbW1lbnQgdCkpDQorICAgICAg KHNldHEgc2F2ZS1idWZmZXItY29kaW5nLXN5c3RlbSAnaXNvLTg4NTktMTUp DQorICAgICAgKHJ1YnktbW9kZS1zZXQtZW5jb2RpbmcpDQorICAgICAgKHNo b3VsZCAoc3RyaW5nPSAiIyBjb2Rpbmc6IGlzby04ODU5LTE1XG7ik4ciIChi dWZmZXItc3RyaW5nKSkpKSkpDQorDQogKGVydC1kZWZ0ZXN0IHJ1YnktLWlu ZGVudC9jb252ZXJ0ZWQtZnJvbS1tYW51YWwtdGVzdCAoKQ0KICAgOnRhZ3Mg Jyg6ZXhwZW5zaXZlLXRlc3QpDQogICA7OyBDb252ZXJ0ZWQgZnJvbSBtYW51 YWwgdGVzdC4NCi0tIA0KMi4yNi4zDQoNCg== ---1463811583-1836946391-1619537357=:3611--