From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 12:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 66663@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16978901653786 (code B ref -1); Sat, 21 Oct 2023 12:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Oct 2023 12:09:25 +0000 Received: from localhost ([127.0.0.1]:42463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quAmz-0000ye-Oj for submit@debbugs.gnu.org; Sat, 21 Oct 2023 08:09:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quAmu-0000xx-BE for submit@debbugs.gnu.org; Sat, 21 Oct 2023 08:09:08 -0400 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 1quAmL-0002eJ-8K for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 08:08:29 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quAmI-0001QF-RO for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 08:08:28 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6b36e1fcee9so1546282b3a.3 for ; Sat, 21 Oct 2023 05:08:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697890104; x=1698494904; darn=gnu.org; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=pozP2tJAfMs80N++Clh/HWcZEy89MvLX4TwuLEoMbwg=; b=OcRz+K70n8LussBmGHGLl5+OSHmvb144tBD8V2/koHSKUUB15AJFlK+ApQJtKvTdvL qmYbXH9fv9UpxaBYmwKO2xfrk1+lt9WMpl1wxFbHYi4ZE6cBWqeCIO8Bi7skzV8XxcGl gIxRyLTTpXZs3sfnUra7bqDyIyW9r+KEgPFrrDdz7IaDmLVX6OeienOhGvALrwB3Oghr s1qVqAMgAyFy90LBe3xOChBlR6qQvw76VUSEP4agZGy3+p9rRuDCyR3wcWbUpwMY8Nw3 4IapL+lJue/Z9HZuHimsRMo5j5fUKhWmrw2rNWoHDjkRglh5Wbhn+/KW/GFZe7KeHg7H 7dkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697890104; x=1698494904; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pozP2tJAfMs80N++Clh/HWcZEy89MvLX4TwuLEoMbwg=; b=Q7yH7np+sQsKkdPL4LXliqIkZ+Vb2JSr6wbTc3R4f+gpzHG6MprXfil/5cgyCU7L34 jMS+W3jIUhH4whEgpCHt31OgY2aLDlozUAfF/8Nn+HxcHow2KrOX1onXhWWxJRk/K5JT XBljiNMnJkVsIvRocyMH1e/sPC5tpf9JEpE3fB+lim8TW1Q3dHq65yUxnGlbBEz+Yzfk 4V3TOOv1thfcaK+K4aeUUSsz01yqp40vkrksd1IZmaS+7KyGGDsgC/qGCogJFQx9xW0g G4egJqSZsgMw38KOcHeLj4Pmojl+AAxeqveFLt7xXyWjTjq9OdDI26rW9CLLpl750eT2 z/wA== X-Gm-Message-State: AOJu0YwmRotjranT2hWbXeuWNm4/IcYuOph+T+TGZ2Vc9O+m/0B67JGO qKsJ6vRPKg7vlxqGrp0OtMnfrLNIMCIpxgBd X-Google-Smtp-Source: AGHT+IEZGfULhwIxoJQAqsrfZaTimrM0V0dRWdOj+ns33kSrcJyG90XSQSuj0uRjp7oI55IJggki9A== X-Received: by 2002:aa7:988c:0:b0:6b5:ec98:427d with SMTP id r12-20020aa7988c000000b006b5ec98427dmr3239346pfl.17.1697890104362; Sat, 21 Oct 2023 05:08:24 -0700 (PDT) Received: from [192.168.0.234] ([152.168.142.156]) by smtp.gmail.com with ESMTPSA id f125-20020a625183000000b0065a1b05193asm3281972pfb.185.2023.10.21.05.08.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Oct 2023 05:08:23 -0700 (PDT) Message-ID: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> Date: Sat, 21 Oct 2023 09:08:21 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mauro Aranda Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=maurooaranda@gmail.com; helo=mail-pf1-x433.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Severity: wishlist This is a feature request, which is a part of trying to land an Easy Customization interface to editing dir locals files: https://lists.gnu.org/archive/html/emacs-devel/2023-09/msg01306.html The need is to be able to specify the file to modify, so that the .dir-locals.el or .dir-locals-2.el can be customized. Currently, the situation is: emacs -Q Go to a directory without a .dir-locals.el file Use add-directory-local-variable to add a variable.  It goes to .dir-locals.el, which is fine.  But it would be nice if I could select to add it to .dir-locals-2.el instead. Similarly, if both .dir-locals.el and .dir-locals-2.el exist, only the .dir-locals-2.el can be modified with *-dir-local-variables, according to my testing.  It'd be nice to be able to modify either. The patch I'll send once I get assigned a Bug# is my first approach to it.  I made the commands take an optional argument, which indicates: "I want to modify that other file".  The intention is: With no prefix arg: - If no dir locals file exists, modify .dir-locals.el - If one of them exists, modify that one. - If the two exists, modify .dir-locals-2.el This is just how today everything works, AFAICT. With a prefix arg: - If no dir locals file exists, modify .dir-locals-2.el - If one of them exists, modify the other one. - If the two exists, modify .dir-locals.el Additionally, I made modify-dir-local-variable take a 5th argument, optional, which can be a boolean or a string (a filename).  The string use case is to be able to directly specify the file to modify, which is useful so one doesn't have to check which file exists and which doesn't (it'll prove useful in the customize code).  I'm not posting the code for cus-edit.el because some part of the code depends if this proposed change gets accepted. From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 12:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 66663@debbugs.gnu.org Cc: Juri Linkov Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.169789063314970 (code B ref 66663); Sat, 21 Oct 2023 12:18:01 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 12:17:13 +0000 Received: from localhost ([127.0.0.1]:42483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quAum-0003tM-Nn for submit@debbugs.gnu.org; Sat, 21 Oct 2023 08:17:13 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:49466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quAuh-0003t3-TC; Sat, 21 Oct 2023 08:17:12 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6b1ef786b7fso1602143b3a.3; Sat, 21 Oct 2023 05:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697890594; x=1698495394; darn=debbugs.gnu.org; h=in-reply-to:cc:references:to:from:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=myT3s0IEwNwVXMXgY66ABlfASn36tqxn8bjlNLmx9M0=; b=gBJcTcitWXQagrgKo1D0ilKcQgbVTv16uUFPoxA9E5P13uiIGTvWbLCPCV92lYK7Zs Il5o5PuZAdtsCvbCsYxQTRlu/uPF6mRrswkcoYuocQ+nihYVXffyzwM0Rzr41LUFTIu6 LSCzU7VsPQPgRg25ruw9dcon4jW/TtG7t0grrE33g14vNo86aBYOFSr0c/wpTqmB9Ydb 8hIgmfFzmGGvKN/ir3pukV1t9dsmFOQpOz0f8zCItghEI7JuqJH+0DRL8vuHhJdZXMzR rk3uta6RuSRLAylikdOYMjJ5WHVhn2AGNoB8v4tANnUQAso97M9DIVcNZUEc3cp8PVFb 5k9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697890594; x=1698495394; h=in-reply-to:cc:references:to:from:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=myT3s0IEwNwVXMXgY66ABlfASn36tqxn8bjlNLmx9M0=; b=K79IYUahKxmOTnyB8n9cd8M1vLPKpXYv3xGDKGWwV7gkP4gY6cCS/pgLlVSq6V9jpn /OpDM+JbZINRI6qk0Acpps6nYL5pEUtc+vsPSCn6ojFf6qMHy+zW6AGo55YmlfLk2DFj c7nuEFo6fZjyXelCD3yIQ/x/nuTs/BiUOfwBvhOtdZGCqD1V/2kGQEZ7eXwTgxqqKWG8 TEYBT8t8CsnjKZbpwv3UnCmuDDCZ4Xiov2ugWbOozqnrylBGUknpYco0KlKglaoWF2jV /hKca/cqmBqJKsYBX4cBngiWTIM0qBYDBV1qXT6lcxmyGVQvAFS56zFa5cFaehO/ziEM xhrw== X-Gm-Message-State: AOJu0YzkDvO6uMJuhxVWXCJU+Ba7R6jZSQ/Ob8HTDNVbHpZtbBiaDY91 mPL+hp2OjeNNtwFVROHduRpbljLFsQbME0+p X-Google-Smtp-Source: AGHT+IHjuezxV2FntH8MUBSeXEOP7U02YeLNayOaVu5WphbaPQoEMSS/EMQuvJBNyshRM6P0c97Ixw== X-Received: by 2002:a05:6a00:2195:b0:6bd:f760:6a9d with SMTP id h21-20020a056a00219500b006bdf7606a9dmr4407060pfi.14.1697890591789; Sat, 21 Oct 2023 05:16:31 -0700 (PDT) Received: from [192.168.0.234] ([152.168.142.156]) by smtp.gmail.com with ESMTPSA id z6-20020aa79f86000000b006be4bb0d2dcsm3272879pfr.149.2023.10.21.05.16.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Oct 2023 05:16:31 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------4rRYNOCia3aaDN4FAC6tqvd4" Message-ID: Date: Sat, 21 Oct 2023 09:16:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mauro Aranda References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> In-Reply-To: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------4rRYNOCia3aaDN4FAC6tqvd4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit tags 66663 patch quit Here's the patch. Juri, could you take a look to see if this approach is fine? Thank you. --------------4rRYNOCia3aaDN4FAC6tqvd4 Content-Type: text/x-patch; charset=UTF-8; name="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.patch" Content-Disposition: attachment; filename*0="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxZmEwMzgzNTA2MmJmZDM1MTk2ODdlYWRjMTc5ZDU2NDdlYjYxZjI1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMjEgT2N0IDIwMjMgMDk6MTQ6MjUgLTAzMDAKU3ViamVjdDog W1BBVENIXSBBbGxvdyBzcGVjaWZ5aW5nIHRoZSBkaXIgbG9jYWxzIGZpbGUgdG8gZWRpdCAo QnVnIzY2NjYzKQoKKiBsaXNwL2ZpbGVzLXguZWwgKG1vZGlmeS1kaXItbG9jYWwtdmFyaWFi bGUpOiBUYWtlIGEgNXRoIG9wdGlvbmFsCmFyZ3VtZW50LCB0byBtYW5pcHVsYXRlIHdoaWNo IGRpciBsb2NhbHMgZmlsZSBnZXRzIHNlbGVjdGVkLgooYWRkLWRpci1sb2NhbC12YXJpYWJs ZSwgZGVsZXRlLWRpci1sb2NhbC12YXJpYWJsZSkKKGNvcHktZmlsZS1sb2NhbHMtdG8tZGly LWxvY2Fscyk6IFRha2UgYSBwcmVmaXggYXJndW1lbnQgYW5kIHBhc3MgaXQKdG8gbW9kaWZ5 LWRpci1sb2NhbC12YXJpYWJsZS4KKiBldGMvTkVXUzogQW5ub3VuY2UgdGhlIGNoYW5nZS4K KiBkb2MvZW1hY3MvY3VzdG9tLnRleGkgKERpcmVjdG9yeSBWYXJpYWJsZXMpOiBEb2N1bWVu dCB0aGUgbmV3CmZ1bmN0aW9uYWxpdHkuCi0tLQogZG9jL2VtYWNzL2N1c3RvbS50ZXhpIHwg MTQgKysrKysrLQogZXRjL05FV1MgICAgICAgICAgICAgIHwgMTAgKysrKysKIGxpc3AvZmls ZXMteC5lbCAgICAgICB8IDkxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgOTcgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2VtYWNzL2N1c3RvbS50ZXhpIGIvZG9jL2VtYWNz L2N1c3RvbS50ZXhpCmluZGV4IDhjMzBmMjZiYmY3Li5kZjZiY2FkNTA2YSAxMDA2NDQKLS0t IGEvZG9jL2VtYWNzL2N1c3RvbS50ZXhpCisrKyBiL2RvYy9lbWFjcy9jdXN0b20udGV4aQpA QCAtMTUwNyw3ICsxNTA3LDE5IEBAIERpcmVjdG9yeSBWYXJpYWJsZXMKIGVudHJ5IGRlZmlu aW5nIHRoZSBkaXJlY3RvcnktbG9jYWwgdmFyaWFibGUuICBAa2Jke00teAogZGVsZXRlLWRp ci1sb2NhbC12YXJpYWJsZX0gZGVsZXRlcyBhbiBlbnRyeS4gIEBrYmR7TS14CiBjb3B5LWZp bGUtbG9jYWxzLXRvLWRpci1sb2NhbHN9IGNvcGllcyB0aGUgZmlsZS1sb2NhbCB2YXJpYWJs ZXMgaW4gdGhlCi1jdXJyZW50IGZpbGUgaW50byBAZmlsZXsuZGlyLWxvY2Fscy5lbH0uCitj dXJyZW50IGZpbGUgaW50byBAZmlsZXsuZGlyLWxvY2Fscy5lbH0sIG9yIEBmaWxley5kaXIt bG9jYWxzLTIuZWx9IGlmCit0aGF0IGZpbGUgaXMgYWxzbyBwcmVzZW50LgorCitTaW5jZSBi b3RoIEBmaWxley5kaXItbG9jYWxzLmVsfSBhbmQgQGZpbGV7LmRpci1sb2NhbHMtMi5lbH0g ZmlsZQorbWlnaHQgZXhpc3QgaW4gdGhlIHNhbWUgZGlyZWN0b3J5LCB0aGVyZSBtYXkgYmUg c29tZSBjbGFzaCBhYm91dCB3aGljaAorZmlsZSB5b3Ugd2FudCB0byBtb2RpZnkgd2hlbiBl eGVjdXRpbmcgdGhlIGFib3ZlIHRocmVlIGNvbW1hbmRzLiAgVG8KK3NvbHZlIHRoYXQsIGFs bCB0aHJlZSBvZiB0aGVtIHRha2UgYSBwcmVmaXggYXJndW1lbnQsIHRvIGluZGljYXRlCit3 aGljaCBmaWxlIHlvdSB3YW50IHRvIG1vZGlmeS4gIFdoZW4gYm90aCBmaWxlcyBleGlzdCwg YSBwcmVmaXgKK2FyZ3VtZW50IG1lYW5zIHRvIHByZWZlciB0byBtb2RpZnkgQGZpbGV7LmRp ci1sb2NhbHMuZWx9IGluc3RlYWQgb2YKK0BmaWxley5kaXItbG9jYWxzLTIuZWx9LiAgV2hl biBvbmUgb2YgdGhlIGZpbGVzIGRvZXNuJ3QgZXhpc3QsIGFuZAoreW91J3JlIGFkZGluZyBh IHZhcmlhYmxlIG9yIGNvcHlpbmcgdGhlIGZpbGUtbG9jYWwgdmFyaWFibGVzLCBhIHByZWZp eAorYXJndW1lbnQgbWVhbnMgdG8gbW9kaWZ5IChpLmUuLCBjcmVhdGUpIHRoZSBmaWxlIHRo YXQgZG9lc24ndCB5ZXQKK2V4aXN0LgogCiBAZmluZGV4IGRpci1sb2NhbHMtc2V0LWNsYXNz LXZhcmlhYmxlcwogQGZpbmRleCBkaXItbG9jYWxzLXNldC1kaXJlY3RvcnktY2xhc3MKZGlm ZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggM2Q0Y2RkODc2YjMuLjVjNWFl MDU4MWQyIDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMTg3LDYg KzE4NywxMSBAQCByaWdodC1hbGlnbmVkIHRvIGlzIGNvbnRyb2xsZWQgYnkgdGhlIG5ldyB1 c2VyIG9wdGlvbgogSXQgY2FuIGJlIHVzZWQgdG8gYWRkLCByZW1vdmUgYW5kIHJlb3JkZXIg ZnVuY3Rpb25zIHRoYXQgY2hhbmdlCiB0aGUgYXBwZWFyYW5jZSBvZiBldmVyeSB0YWIgb24g dGhlIHRhYiBiYXIuCiAKKysrKworKiogTmV3IG9wdGlvbmFsIGFyZ3VtZW50IGZvciBtb2Rp ZnlpbmcgZGlyZWN0b3J5IGxvY2FsIHZhcmlhYmxlcworVGhlIGNvbW1hbmRzICdhZGQtZGly LWxvY2FsLXZhcmlhYmxlJywgJ2RlbGV0ZS1kaXItbG9jYWwtdmFyaWFibGUnIGFuZAorJ2Nv cHktZmlsZS1sb2NhbHMtdG8tZGlyLWxvY2Fscycgbm93IHRha2UgYW4gb3B0aW9uYWwgcHJl Zml4IGFyZ3VtZW50LAordG8gaW5kaWNhdGUgd2hpY2ggZmlsZSB5b3Ugd2FudCB0byBtb2Rp ZnkuCiAqKiBNaXNjZWxsYW5lb3VzCiAKIC0tLQpAQCAtMTMzNyw2ICsxMzQyLDExIEBAIFNp bmNlIGNpcmN1bGFyIGFsaWFzIGNoYWlucyBub3cgY2Fubm90IG9jY3VyLCAnZnVuY3Rpb24t YWxpYXMtcCcsCiAnaW5kaXJlY3QtZnVuY3Rpb24nIGFuZCAnaW5kaXJlY3QtdmFyaWFibGUn IHdpbGwgbmV2ZXIgc2lnbmFsIGFuIGVycm9yLgogVGhlaXIgJ25vZXJyb3InIGFyZ3VtZW50 cyBoYXZlIG5vIGVmZmVjdCBhbmQgYXJlIHRoZXJlZm9yZSBvYnNvbGV0ZS4KIAorLS0tCisq KiBOZXcgb3B0aW9uYWwgYXJndW1lbnQgdG8gJ21vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUn CitBIDV0aCBhcmd1bWVudCwgb3B0aW9uYWwsIGhhcyBiZWVuIGFkZGVkIHRvCisnbW9kaWZ5 LWRpci1sb2NhbC12YXJpYWJsZScuICBJdCBjYW4gYmUgdXNlZCB0byBzcGVjaWZ5IHdoaWNo CitkaXItbG9jYWxzIGZpbGUgdG8gbW9kaWZ5LgogDAogKiBDaGFuZ2VzIGluIEVtYWNzIDMw LjEgb24gTm9uLUZyZWUgT3BlcmF0aW5nIFN5c3RlbXMKIApkaWZmIC0tZ2l0IGEvbGlzcC9m aWxlcy14LmVsIGIvbGlzcC9maWxlcy14LmVsCmluZGV4IDNiYTc2MzJkMjUzLi5jMDM3OWZl MTA4NCAxMDA2NDQKLS0tIGEvbGlzcC9maWxlcy14LmVsCisrKyBiL2xpc3AvZmlsZXMteC5l bApAQCAtMzEsNiArMzEsNyBAQAogOzs7IENvZGU6CiAKIChldmFsLXdoZW4tY29tcGlsZSAo cmVxdWlyZSAnc3Vici14KSkgOyBmb3Igc3RyaW5nLXRyaW0tcmlnaHQKKyhkZWNsYXJlLWZ1 bmN0aW9uIGRvc2lmaWVkLWZpbGUtbmFtZSAiZG9zLWZucyIgKGZpbGUtbmFtZSkpCiAKIAwK IDs7OyBDb21tYW5kcyB0byBhZGQvZGVsZXRlIGZpbGUtbG9jYWwvZGlyZWN0b3J5LWxvY2Fs IHZhcmlhYmxlcy4KQEAgLTQxMCw3ICs0MTEsNyBAQCBkZWxldGUtZmlsZS1sb2NhbC12YXJp YWJsZS1wcm9wLWxpbmUKIAogKGRlZnZhciBhdXRvLWluc2VydCkgOyBmcm9tIGF1dG9pbnNl cnQuZWwKIAotKGRlZnVuIG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUgKG1vZGUgdmFyaWFi bGUgdmFsdWUgb3ApCisoZGVmdW4gbW9kaWZ5LWRpci1sb2NhbC12YXJpYWJsZSAobW9kZSB2 YXJpYWJsZSB2YWx1ZSBvcCAmb3B0aW9uYWwgZmlsZSkKICAgIk1vZGlmeSBkaXJlY3Rvcnkt bG9jYWwgVkFSSUFCTEUgaW4gLmRpci1sb2NhbHMuZWwgZGVwZW5kaW5nIG9uIG9wZXJhdGlv biBPUC4KIAogSWYgT1AgaXMgYGFkZC1vci1yZXBsYWNlJyB0aGVuIGRlbGV0ZSBhbGwgZXhp c3Rpbmcgc2V0dGluZ3Mgb2YKQEAgLTQyMiw3ICs0MjMsMTIgQEAgbW9kaWZ5LWRpci1sb2Nh bC12YXJpYWJsZQogdGhpcyBmaWxlIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeS4KIAogSWYg T1AgaXMgYGRlbGV0ZScgdGhlbiBkZWxldGUgYWxsIGV4aXN0aW5nIHNldHRpbmdzIG9mIFZB UklBQkxFCi1mcm9tIHRoZSBNT0RFIGFsaXN0IGlnbm9yaW5nIHRoZSBpbnB1dCBhcmd1bWVu dCBWQUxVRS4iCitmcm9tIHRoZSBNT0RFIGFsaXN0IGlnbm9yaW5nIHRoZSBpbnB1dCBhcmd1 bWVudCBWQUxVRS4KKworRklMRSBzcGVjaWZpZXMgd2hhdCBmaWxlIHRvIG1vZGlmeS4gIEl0 IGNhbiBiZSBhIHN0cmluZywgdGhlIG5hbWUgb2YgdGhlCitkaXItbG9jYWxzIGZpbGUgdG8g bW9kaWZ5LiAgSXQgY2FuIGFsc28gYmUgYW55IG90aGVyIG5vbi1uaWwgdmFsdWUsIGluIHdo aWNoCitjYXNlIHRoZSBmaWxlIHRvIG1vZGlmeSBpcyAuZGlyLWxvY2Fscy5lbCwgaWYgLmRp ci1sb2NhbHMtMi5lbCBleGlzdHMsIG9yCisuZGlyLWxvY2Fscy0yLmVsIGlmIC5kaXItbG9j YWxzLmVsIGV4aXN0cyBidXQgdGhlIGZvcm1lciBkb2Vzbid0LiIKICAgKGNhdGNoICdleGl0 CiAgICAgKHVubGVzcyBlbmFibGUtbG9jYWwtdmFyaWFibGVzCiAgICAgICAodGhyb3cgJ2V4 aXQgKG1lc3NhZ2UgIkRpcmVjdG9yeS1sb2NhbCB2YXJpYWJsZXMgYXJlIGRpc2FibGVkIikp KQpAQCAtNDMyLDcgKzQzOCw4IEBAIG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUKICAgICAg ICAgICAgKHZhcmlhYmxlcy1maWxlCiAgICAgICAgICAgICA7OyBJZiB0aGVyZSBhcmUgc2V2 ZXJhbCAuZGlyLWxvY2FscywgdGhlIHVzZXIgcHJvYmFibHkKICAgICAgICAgICAgIDs7IHdh bnRzIHRvIGVkaXQgdGhlIGxhc3Qgb25lICh0aGUgaGlnaGVzdCBwcmlvcml0eSkuCi0gICAg ICAgICAgICAoY29uZCAoKHN0cmluZ3AgZGlyLW9yLWNhY2hlKQorICAgICAgICAgICAgKGNv bmQgKChzdHJpbmdwIGZpbGUpIGZpbGUpCisgICAgICAgICAgICAgICAgICAoKHN0cmluZ3Ag ZGlyLW9yLWNhY2hlKQogICAgICAgICAgICAgICAgICAgIChjYXIgKGxhc3QgKGRpci1sb2Nh bHMtLWFsbC1maWxlcyBkaXItb3ItY2FjaGUpKSkpCiAgICAgICAgICAgICAgICAgICAoKGNv bnNwIGRpci1vci1jYWNoZSkJOyByZXN1bHQgZnJvbSBjYWNoZQogICAgICAgICAgICAgICAg ICAgIDs7IElmIGNhY2hlIGVsZW1lbnQgaGFzIGFuIG10aW1lLCBhc3N1bWUgaXQgY2FtZQpA QCAtNDQxLDkgKzQ0OCwzNCBAQCBtb2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlCiAgICAgICAg ICAgICAgICAgICAgKGlmIChudGggMiBkaXItb3ItY2FjaGUpCiAgICAgICAgICAgICAgICAg ICAgICAgIChjYXIgKGxhc3QgKGRpci1sb2NhbHMtLWFsbC1maWxlcyAoY2FyIGRpci1vci1j YWNoZSkpKSkKICAgICAgICAgICAgICAgICAgICAgIChjYWRyIGRpci1vci1jYWNoZSkpKQot ICAgICAgICAgICAgICAgICAgOzsgVHJ5IHRvIG1ha2UgYSBwcm9wZXIgZmlsZS1uYW1lLgot ICAgICAgICAgICAgICAgICAgKHQgKGV4cGFuZC1maWxlLW5hbWUgZGlyLWxvY2Fscy1maWxl KSkpKQorICAgICAgICAgICAgICAgICAgOzsgVHJ5IHRvIG1ha2UgYSBwcm9wZXIgZmlsZS1u YW1lLCByZXNwZWN0aW5nIEZJTEUuCisgICAgICAgICAgICAgICAgICAodCAobGV0KiAoKHBy aSAoZXhwYW5kLWZpbGUtbmFtZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChpZiAoZXEgc3lzdGVtLXR5cGUgJ21zLWRvcykKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGRvc2lmaWVkLWZpbGUtbmFtZSBkaXItbG9jYWxzLWZpbGUpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXItbG9jYWxzLWZpbGUpKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc2VjIChyZXBsYWNlLXJlZ2V4cC1pbi1z dHJpbmcgIi5lbCQiICItMi5lbCIgcHJpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoc2VjLWV4aXN0cy1wIChmaWxlLWV4aXN0cy1wIHNlYykpKQorICAgICAgICAgICAgICAg ICAgICAgICAoaWYgZmlsZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgV2hlbiBh bHRlcm5hdGluZywgcHJlZmVyIC5kaXItbG9jYWxzLmVsIGlmCisgICAgICAgICAgICAgICAg ICAgICAgICAgICA7OyAuZGlyLWxvY2Fscy0yLmVsIGV4aXN0cywgb3IgLmRpci1sb2NhbHMt Mi5lbAorICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgaWYgaXQgZG9lc24ndCBleGlz dCAob3IgbmVpdGhlciBleGlzdCkuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYg c2VjLWV4aXN0cy1wIHByaSBzZWMpCisgICAgICAgICAgICAgICAgICAgICAgICAgKGlmIHNl Yy1leGlzdHMtcCBzZWMgcHJpKSkpKSkpCiAgICAgICAgICAgIHZhcmlhYmxlcykKKyAgICAg IDs7IFdoZW4gYWx0ZXJuYXRpbmcsIEZJTEUgaXMgbm9uLW5pbCBhbmQgbm90IGEgc3RyaW5n LgorICAgICAgOzsgV2UgY2hlY2sgZm9yIGBkaXItb3ItY2FjaGUnIG5vbi1uaWwsIGJlY2F1 c2Ugd2UgaGFuZGxlZCB0aGUgbmlsCisgICAgICA7OyBjYXNlIGluIHRoZSBgY29uZCcgYWJv dmUuCisgICAgICAod2hlbiAoYW5kIGZpbGUgKG5vdCAoc3RyaW5ncCBmaWxlKSkKKyAgICAg ICAgICAgICAgICAgZGlyLW9yLWNhY2hlCisgICAgICAgICAgICAgICAgIChzdHJpbmdwIHZh cmlhYmxlcy1maWxlKSkKKyAgICAgICAgOzsgSWYgd2UgZ290IHRoZSAuZGlyLWxvY2Fscy0y LmVsIGZpbGUsIG1ha2UgaXQKKyAgICAgICAgOzsgdGhlIC5kaXItbG9jYWxzLmVsIGZpbGUu CisgICAgICAgIChpZiAoc3RyaW5nLW1hdGNoICJbXjJdXFwoXFwuZWwkXFwpIiB2YXJpYWJs ZXMtZmlsZSkKKyAgICAgICAgICAgIChzZXRxIHZhcmlhYmxlcy1maWxlIChyZXBsYWNlLW1h dGNoICItMi5lbCIgdCBuaWwgdmFyaWFibGVzLWZpbGUgMSkpCisgICAgICAgICAgOzsgQW5k IGlmIHdlIGdvdCB0aGUgLmRpci1sb2NhbHMuZWwgZmlsZSwgbWFrZSBpdCB0aGUKKyAgICAg ICAgICA7OyAuZGlyLWxvY2Fscy0yLmVsIGZpbGUuCisgICAgICAgICAgKHNldHEgdmFyaWFi bGVzLWZpbGUKKyAgICAgICAgICAgICAgICAocmVwbGFjZS1yZWdleHAtaW4tc3RyaW5nICIt Mi5lbCQiICIuZWwiIHZhcmlhYmxlcy1maWxlKSkpKQogICAgICAgOzsgSSBjYW4ndCBiZSBi b3RoZXJlZCB0byBoYW5kbGUgdGhpcyBjYXNlIHJpZ2h0IG5vdy4KICAgICAgIDs7IERpciBs b2NhbHMgd2VyZSBzZXQgZGlyZWN0bHkgZnJvbSBhIGNsYXNzLiAgWW91IG5lZWQgdG8KICAg ICAgIDs7IGRpcmVjdGx5IG1vZGlmeSB0aGUgY2xhc3MgaW4gZGlyLWxvY2Fscy1jbGFzcy1h bGlzdC4KQEAgLTUyOCwzMiArNTYwLDU3IEBAIGRpci1sb2NhbHMtdG8tc3RyaW5nCiAgICAg ICAgICAgIHZhcmlhYmxlcyAiXG4iKSkpCiAKIDs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gYWRk LWRpci1sb2NhbC12YXJpYWJsZSAobW9kZSB2YXJpYWJsZSB2YWx1ZSkKLSAgIkFkZCBkaXJl Y3RvcnktbG9jYWwgVkFSSUFCTEUgd2l0aCBpdHMgVkFMVUUgYW5kIE1PREUgdG8gLmRpci1s b2NhbHMuZWwuIgorKGRlZnVuIGFkZC1kaXItbG9jYWwtdmFyaWFibGUgKG1vZGUgdmFyaWFi bGUgdmFsdWUgJm9wdGlvbmFsIGFsdCkKKyAgIkFkZCBkaXJlY3RvcnktbG9jYWwgVkFSSUFC TEUgd2l0aCBpdHMgVkFMVUUgYW5kIE1PREUgdG8gLmRpci1sb2NhbHMuZWwuCisKK0EgcHJl Zml4IGFyZ3VtZW50IGNoYW5nZXMgdGhlIGZpbGUgdG8gbW9kaWZ5LiAgV2hlbiBnaXZlbiBh bmQgLmRpci1sb2NhbHMuZWwKK2V4aXN0cyBidXQgLmRpci1sb2NhbHMtMi5lbCBkb2VzIG5v dCwgaXQgbW9kaWZpZXMgLmRpci1sb2NhbHMtMi5lbCwgcG9zc2libHkKK2NyZWF0aW5nIGl0 LiAgT24gdGhlIGNvbnRyYXJ5LCB3aGVuIGJvdGggZmlsZXMgZXhpc3QsIGEgcHJlZml4IGFy Z3VtZW50IG1lYW5zCit0byBwcmVmZXIgdG8gYWRkIFZBUklBQkxFIHRvIC5kaXItbG9jYWxz LmVsLgorCitXaGVuIGNhbGxlZCBmcm9tIExpc3AsIEFMVCBtYXkgYWxzbyBiZSB0aGUgZXhw YW5kZWQgbmFtZSBvZiB0aGUgZGlyLWxvY2FscyBmaWxlCit3aGVyZSB0byBhZGQgVkFSSUFC TEUuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKHZhcmlhYmxlKQogICAgICAobGlzdAog ICAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZS1tb2RlKQogICAgICAgKHNldHEgdmFy aWFibGUgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZSAiQWRkIGRpcmVjdG9yeS1sb2NhbCB2 YXJpYWJsZSIpKQotICAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZS12YWx1ZSB2YXJp YWJsZSkpKSkKLSAgKG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUgbW9kZSB2YXJpYWJsZSB2 YWx1ZSAnYWRkLW9yLXJlcGxhY2UpKQorICAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJs ZS12YWx1ZSB2YXJpYWJsZSkKKyAgICAgIGN1cnJlbnQtcHJlZml4LWFyZykpKQorICAgKG1v ZGlmeS1kaXItbG9jYWwtdmFyaWFibGUgbW9kZSB2YXJpYWJsZSB2YWx1ZSAnYWRkLW9yLXJl cGxhY2UgYWx0KSkKIAogOzs7IyMjYXV0b2xvYWQKLShkZWZ1biBkZWxldGUtZGlyLWxvY2Fs LXZhcmlhYmxlIChtb2RlIHZhcmlhYmxlKQotICAiRGVsZXRlIGFsbCBNT0RFIHNldHRpbmdz IG9mIGZpbGUtbG9jYWwgVkFSSUFCTEUgZnJvbSAuZGlyLWxvY2Fscy5lbC4iCisoZGVmdW4g ZGVsZXRlLWRpci1sb2NhbC12YXJpYWJsZSAobW9kZSB2YXJpYWJsZSAmb3B0aW9uYWwgYWx0 KQorICAiRGVsZXRlIGFsbCBNT0RFIHNldHRpbmdzIG9mIGRpci1sb2NhbCBWQVJJQUJMRSBm cm9tIC5kaXItbG9jYWxzLmVsLgorCitBIHByZWZpeCBhcmd1bWVudCBjaGFuZ2VzIHRoZSBm aWxlIHRvIG1vZGlmeS4gIElmIGdpdmVuIGFuZCBpZiBib3RoCisuZGlyLWxvY2Fscy0yLmVs IGFuZCAuZGlyLWxvY2Fscy5lbCBleGlzdCwgcHJlZmVyIHRvIGRlbGV0ZSBWQVJJQUJMRSBm cm9tCisuZGlyLWxvY2Fscy5lbC4KKworV2hlbiBjYWxsZWQgZnJvbSBMaXNwLCBBTFQgbWF5 IGFsc28gYmUgdGhlIGV4cGFuZGVkIG5hbWUgb2YgdGhlIGRpci1sb2NhbHMgZmlsZQorZnJv bSB3aGVyZSB0byBkZWxldGUgVkFSSUFCTEUuIgogICAoaW50ZXJhY3RpdmUKICAgIChsaXN0 CiAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZS1tb2RlKQotICAgIChyZWFkLWZpbGUt bG9jYWwtdmFyaWFibGUgIkRlbGV0ZSBkaXJlY3RvcnktbG9jYWwgdmFyaWFibGUiKSkpCi0g IChtb2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlIG1vZGUgdmFyaWFibGUgbmlsICdkZWxldGUp KQorICAgIChyZWFkLWZpbGUtbG9jYWwtdmFyaWFibGUgIkRlbGV0ZSBkaXJlY3RvcnktbG9j YWwgdmFyaWFibGUiKQorICAgIGN1cnJlbnQtcHJlZml4LWFyZykpCisgIChtb2RpZnktZGly LWxvY2FsLXZhcmlhYmxlIG1vZGUgdmFyaWFibGUgbmlsICdkZWxldGUgYWx0KSkKIAogOzs7 IyMjYXV0b2xvYWQKLShkZWZ1biBjb3B5LWZpbGUtbG9jYWxzLXRvLWRpci1sb2NhbHMgKCkK LSAgIkNvcHkgZmlsZS1sb2NhbCB2YXJpYWJsZXMgdG8gLmRpci1sb2NhbHMuZWwuIgotICAo aW50ZXJhY3RpdmUpCisoZGVmdW4gY29weS1maWxlLWxvY2Fscy10by1kaXItbG9jYWxzICgm b3B0aW9uYWwgYWx0KQorICAiQ29weSBmaWxlLWxvY2FsIHZhcmlhYmxlcyB0byAuZGlyLWxv Y2Fscy5lbC4KKworQSBwcmVmaXggYXJndW1lbnQgY2hhbmdlcyB0aGUgZmlsZSB0byBtb2Rp ZnkuICBXaGVuIGdpdmVuIGFuZCAuZGlyLWxvY2Fscy5lbAorZXhpc3RzIGJ1dCAuZGlyLWxv Y2Fscy0yLmVsIGRvZXMgbm90LCBpdCBtb2RpZmllcyAuZGlyLWxvY2Fscy0yLmVsLCBwb3Nz aWJseQorY3JlYXRpbmcgaXQuICBPbiB0aGUgY29udHJhcnksIGlmIGJvdGggZmlsZXMgZXhp c3QsIGEgcHJlZml4IGFyZ3VtZW50IG1lYW5zCit0byBwcmVmZXIgdG8gY29weSB0aGUgdmFy aWFibGVzIHRvIC5kaXItbG9jYWxzLmVsLgorCitXaGVuIGNhbGxlZCBmcm9tIExpc3AsIEFM VCBtYXkgYWxzbyBiZSB0aGUgZXhwYW5kZWQgbmFtZSBvZiB0aGUgZGlyLWxvY2FscyBmaWxl Cit3aGVyZSB0byBjb3B5IHRoZSBmaWxlLWxvY2FsIHZhcmlhYmxlcy4iCisgIChpbnRlcmFj dGl2ZSAiUCIpCiAgIChkb2xpc3QgKGVsdCBmaWxlLWxvY2FsLXZhcmlhYmxlcy1hbGlzdCkK ICAgICAodW5sZXNzIChhc3NxIChjYXIgZWx0KSBkaXItbG9jYWwtdmFyaWFibGVzLWFsaXN0 KQotICAgICAgKGFkZC1kaXItbG9jYWwtdmFyaWFibGUgbWFqb3ItbW9kZSAoY2FyIGVsdCkg KGNkciBlbHQpKSkpKQorICAgICAgKGFkZC1kaXItbG9jYWwtdmFyaWFibGUgbWFqb3ItbW9k ZSAoY2FyIGVsdCkgKGNkciBlbHQpIGFsdCkpKSkKIAogOzs7IyMjYXV0b2xvYWQKIChkZWZ1 biBjb3B5LWRpci1sb2NhbHMtdG8tZmlsZS1sb2NhbHMgKCkKLS0gCjIuMzQuMQoK --------------4rRYNOCia3aaDN4FAC6tqvd4-- From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 12:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Mauro Aranda Cc: 66663@debbugs.gnu.org, juri@linkov.net Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.169789238228169 (code B ref 66663); Sat, 21 Oct 2023 12:47:01 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 12:46:22 +0000 Received: from localhost ([127.0.0.1]:42519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quBMw-0007KB-9H for submit@debbugs.gnu.org; Sat, 21 Oct 2023 08:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quBMq-0007Jv-FB for 66663@debbugs.gnu.org; Sat, 21 Oct 2023 08:46:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quBMJ-0004lA-9Y; Sat, 21 Oct 2023 08:45:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=fvuDqg2X3ytCh83fR8MyzbOghidHviWhlCzTZqIwkDo=; b=PKdHWG2USh+5 cspjqq+dgoE91GguhXvRqPjZFC2xa8xWeoJD4hibkXR0zl4YUdBlIEO7DwjQ88GXzWwNrOtTpzOn0 fqyQYD4faDEAnI1ihoMvd3X1iShSp232u5uoN1PGlWrgRImwA8/wFF8w73tOQprrrDIJvz5vvbYFy fZjnUdzbGgO2yrHU7SCeH/cbK62ZSf5TprEa0usFqZ3xGX5m9I6QLODMmO9E4KtmLjVOJO4S8Gliv ANTPFMTiO1Z+Os06hiYPxEJIN3T5hBm4TDNcHbhJp3fLOikuxFgse48fEY9IpwhW48B/q9lCw/0Dj QGkDGzs7H3owWUOMdPA38w==; Date: Sat, 21 Oct 2023 15:45:37 +0300 Message-Id: <83o7gsqh3i.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Mauro Aranda on Sat, 21 Oct 2023 09:16:28 -0300) References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: Juri Linkov > Date: Sat, 21 Oct 2023 09:16:28 -0300 > From: Mauro Aranda > > +Since both @file{.dir-locals.el} and @file{.dir-locals-2.el} file > +might exist in the same directory, there may be some clash about which > +file you want to modify when executing the above three commands. To > +solve that, all three of them take a prefix argument, to indicate > +which file you want to modify. When both files exist, a prefix > +argument means to prefer to modify @file{.dir-locals.el} instead of > +@file{.dir-locals-2.el}. When one of the files doesn't exist, and > +you're adding a variable or copying the file-local variables, a prefix > +argument means to modify (i.e., create) the file that doesn't yet > +exist. I think a better UI is to ask the user when the command is invoked with a prefix argument. From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 13:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 66663@debbugs.gnu.org, juri@linkov.net Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.16978962084439 (code B ref 66663); Sat, 21 Oct 2023 13:51:02 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 13:50:08 +0000 Received: from localhost ([127.0.0.1]:42610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quCMi-00019X-7Y for submit@debbugs.gnu.org; Sat, 21 Oct 2023 09:50:08 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]:61937) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quCMd-00018w-F7 for 66663@debbugs.gnu.org; Sat, 21 Oct 2023 09:50:06 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1e993765c1bso1288493fac.3 for <66663@debbugs.gnu.org>; Sat, 21 Oct 2023 06:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697896170; x=1698500970; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=e9vYSDvBWXbwJuEoTjiPAsVSM4pylH/5urVieQjPzzY=; b=bUJP6F+KL+U/SW7sYypLUTByJaA3RXYOu2dpnWWlOplHxKjYBmD17NayXrIzX0SXLI bS9r/+o1D001s37Wotn/x0+7gLVn5qV9tUpQM0WnPnMfFNG+pshSX7gD1Onww6hTqa5B E6lXKAdkXrGWFTMMixRDpyYFqCFKjXbnlwmN6MV/GyrS/6kweEDf0AHhc3h5L5rCf7bS X0vfq/g9LVKclzuLutBdsA1o8n7URPD2PbL2jSoU7Gt7y6e66Rw+pxSDASwTjP1ASQJN a7fT7EnUsh9b/T9vfUiDP2LwiYElaqQ0wpHKGkSrrmtC3UfJFLBttfiMiOU1o6Z3HEvf EI2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697896170; x=1698500970; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e9vYSDvBWXbwJuEoTjiPAsVSM4pylH/5urVieQjPzzY=; b=Srv9QpxpIOgYJMYXlnjJ9s9hmtfwN0/4Lw8Xlg0tb0YIWxk5qS0K/eQfxD3vHox3Hr 1BH4oe3qP6wo2caqlLyA06cIeVBO2c3EaLKFv2bCp/EffxKWc2MxImaGB5DONRwIeuMe 9dnoH9jkIYQWelaxMZyLdFoaCKIY7y08nlY+gYrIoeqcwQYKlfDPa8RbXVfgWmkX6oX7 FsZwpcAGemUWNuzP2820FH5V4hRdZtvBMxULE6+UiN+pyVsJAt0uz985/xWmI6u5DfKJ gq2XxSRqozw4J2k3gxIHgdKnQKDU/pUO+YOUnM8lFum55fhqZNMnuRFfP96wd+5yzRE1 XxDg== X-Gm-Message-State: AOJu0YzxR/3ARkwepQP2meYb8kUwGAv/ycg0YemLWlz+fqz5QClqZq7m n3k3+T15BgvHY7qlCXG/EUw= X-Google-Smtp-Source: AGHT+IFLvBMJAyTRKkzJTa7S4TqzqSNpZBisLk9iltEDeN6saumWNHA7klpap60QbTJE+GG6VL/gqw== X-Received: by 2002:a05:6870:9e4c:b0:1e9:c18b:b2da with SMTP id pt12-20020a0568709e4c00b001e9c18bb2damr5584108oab.18.1697896169759; Sat, 21 Oct 2023 06:49:29 -0700 (PDT) Received: from [192.168.0.234] ([152.168.142.156]) by smtp.gmail.com with ESMTPSA id z20-20020aa79494000000b006926d199fdcsm3294805pfk.190.2023.10.21.06.49.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Oct 2023 06:49:29 -0700 (PDT) Message-ID: <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> Date: Sat, 21 Oct 2023 10:49:26 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> <83o7gsqh3i.fsf@gnu.org> From: Mauro Aranda In-Reply-To: <83o7gsqh3i.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 21/10/23 09:45, Eli Zaretskii wrote: >> Cc: Juri Linkov >> Date: Sat, 21 Oct 2023 09:16:28 -0300 >> From: Mauro Aranda >> >> +Since both @file{.dir-locals.el} and @file{.dir-locals-2.el} file >> +might exist in the same directory, there may be some clash about which >> +file you want to modify when executing the above three commands.  To >> +solve that, all three of them take a prefix argument, to indicate >> +which file you want to modify.  When both files exist, a prefix >> +argument means to prefer to modify @file{.dir-locals.el} instead of >> +@file{.dir-locals-2.el}.  When one of the files doesn't exist, and >> +you're adding a variable or copying the file-local variables, a prefix >> +argument means to modify (i.e., create) the file that doesn't yet >> +exist. > > I think a better UI is to ask the user when the command is invoked > with a prefix argument. Yes, that makes sense.  I'll try that approach. From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 66663@debbugs.gnu.org, juri@linkov.net Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.16978972298238 (code B ref 66663); Sat, 21 Oct 2023 14:08:01 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 14:07:09 +0000 Received: from localhost ([127.0.0.1]:44764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quCdA-00028n-UZ for submit@debbugs.gnu.org; Sat, 21 Oct 2023 10:07:09 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:55499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quCd7-00028D-5F for 66663@debbugs.gnu.org; Sat, 21 Oct 2023 10:07:07 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5ac88d2cfaaso1379765a12.2 for <66663@debbugs.gnu.org>; Sat, 21 Oct 2023 07:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697897191; x=1698501991; darn=debbugs.gnu.org; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=1gP4iZKb3RSJ18U6oOAnkQqiQLR/6Deuzc3Jx81uc4s=; b=MBnxcf9rY7vvF/IvAP64PpsRMTVszPZWcs7ZBG4JwsqAFCvSWsd0J6pO5bHyG8fYOC PvAubYpK2AojitUiidig2xqESGdiZQBSUn8DPeBkCjS3k7FwVMJIPGIo1pUPmDEVyU3w 6ov8p6yCRM2kroTWQT9uoECPEaVyWOGDIeHJi+DwSqVk52hnvbWap9OMJjzcw+1kEH/1 cwZeAwifNMqooaVDTd/7UPtrE6e3s4p7PQ8RazD6iu5VD67GiznjBYbXuhxt/3GKaSu1 Ilf6zKVuG+afG3AiE98JQw3yDsCisWNGg70cEBYUbRQY6cXqqyJJBdAf174TF0iMsgdA YccQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697897191; x=1698501991; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=1gP4iZKb3RSJ18U6oOAnkQqiQLR/6Deuzc3Jx81uc4s=; b=QTBDdhtCcPBXzB4IUHjGOagBJlHjqerZRDBr5QAftjfNb4fOZLa1BurbQZpJmpNewQ 1i7ZMwCBzPe2pdhwiHHKJmg7dvZH6Fxb+oGrhY+Y/pI44AoG4oizUeJa/U97AGFevX1T H6u60w0GErvqj9thf/LJc+bYKy4og0aUkcHY4ytP9OLvYz4QKG/KqSRV1DV9blyaU62S u7bIqwJ9qoG6HaYC65ZM5VdKMafT/T111fXpLui7xgf+Ur2E4d4ivKtgE7HOaIzKjZTY qDz57B/a4MeAJqaXClFX9RjOA4d+kil6OIkPPopDaS9alRA0tQtBdoFt31pWaH8TijAI k7og== X-Gm-Message-State: AOJu0YyKwoNjPy6AfyReWpptnFqOsuuVdXCvRQHgmyvJ1ARCWOL1QU3t 3yin0tbrt+jMDQkqxJeowrA= X-Google-Smtp-Source: AGHT+IE++P07EZT1o4h4wxoL57o89IjrP8TP0GsQbbLQ5Yh+vf/Fm54P6R+bIxnO4pmUht56CSnkNw== X-Received: by 2002:a17:902:facb:b0:1ca:85ae:3b59 with SMTP id ld11-20020a170902facb00b001ca85ae3b59mr4970064plb.9.1697897191360; Sat, 21 Oct 2023 07:06:31 -0700 (PDT) Received: from [192.168.0.234] ([152.168.142.156]) by smtp.gmail.com with ESMTPSA id q21-20020a170902789500b001c8836a3795sm3217916pll.271.2023.10.21.07.06.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Oct 2023 07:06:30 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------EFmtouJOj1YeXyDcPviGJ66C" Message-ID: Date: Sat, 21 Oct 2023 11:06:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mauro Aranda References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> <83o7gsqh3i.fsf@gnu.org> <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> In-Reply-To: <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------EFmtouJOj1YeXyDcPviGJ66C Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 21/10/23 10:49, Mauro Aranda wrote: > On 21/10/23 09:45, Eli Zaretskii wrote: > >> Cc: Juri Linkov > >> Date: Sat, 21 Oct 2023 09:16:28 -0300 > >> From: Mauro Aranda > >> > >> +Since both @file{.dir-locals.el} and @file{.dir-locals-2.el} file > >> +might exist in the same directory, there may be some clash about which > >> +file you want to modify when executing the above three commands. To > >> +solve that, all three of them take a prefix argument, to indicate > >> +which file you want to modify. When both files exist, a prefix > >> +argument means to prefer to modify @file{.dir-locals.el} instead of > >> +@file{.dir-locals-2.el}. When one of the files doesn't exist, and > >> +you're adding a variable or copying the file-local variables, a prefix > >> +argument means to modify (i.e., create) the file that doesn't yet > >> +exist. > > > > I think a better UI is to ask the user when the command is invoked > > with a prefix argument. > > Yes, that makes sense. I'll try that approach. I reworked the patch to implement that UI instead. Patch attached. --------------EFmtouJOj1YeXyDcPviGJ66C Content-Type: text/x-patch; charset=UTF-8; name="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.patch" Content-Disposition: attachment; filename*0="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAwNzdhNmE4YjgzY2QxZmI2ZWZhOWYxNjk4MzFhZDZhZGVjNTIzMTJhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMjEgT2N0IDIwMjMgMTE6MDI6MzYgLTAzMDAKU3ViamVjdDog W1BBVENIXSBBbGxvdyBzcGVjaWZ5aW5nIHRoZSBkaXIgbG9jYWxzIGZpbGUgdG8gZWRpdCAo QnVnIzY2NjYzKQoKKiBsaXNwL2ZpbGVzLXguZWwgKG1vZGlmeS1kaXItbG9jYWwtdmFyaWFi bGUpOiBUYWtlIGEgNXRoIG9wdGlvbmFsCmFyZ3VtZW50LCB0aGUgZmlsZW5hbWUgb2YgdGhl IGRpciBsb2NhbHMgZmlsZSB0byBtb2RpZnkuCihhZGQtZGlyLWxvY2FsLXZhcmlhYmxlLCBk ZWxldGUtZGlyLWxvY2FsLXZhcmlhYmxlKQooY29weS1maWxlLWxvY2Fscy10by1kaXItbG9j YWxzKTogT3B0aW9uYWxseSByZWFkIHRoZSBmaWxlbmFtZSB0bwptb2RpZnksIGFuZCBwYXNz IGl0IHRvIG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUuCiogZXRjL05FV1M6IEFubm91bmNl IHRoZSBjaGFuZ2UuCiogZG9jL2VtYWNzL2N1c3RvbS50ZXhpIChEaXJlY3RvcnkgVmFyaWFi bGVzKTogRG9jdW1lbnQgdGhlIG5ldwpmdW5jdGlvbmFsaXR5LgotLS0KIGRvYy9lbWFjcy9j dXN0b20udGV4aSB8ICAgOCArKy0KIGV0Yy9ORVdTICAgICAgICAgICAgICB8ICAxMCArKysr CiBsaXNwL2ZpbGVzLXguZWwgICAgICAgfCAxMTAgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDk1IGluc2VydGlvbnMoKyks IDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9jdXN0b20udGV4aSBi L2RvYy9lbWFjcy9jdXN0b20udGV4aQppbmRleCA4YzMwZjI2YmJmNy4uYWRlY2M4NzMxNjMg MTAwNjQ0Ci0tLSBhL2RvYy9lbWFjcy9jdXN0b20udGV4aQorKysgYi9kb2MvZW1hY3MvY3Vz dG9tLnRleGkKQEAgLTE1MDcsNyArMTUwNywxMyBAQCBEaXJlY3RvcnkgVmFyaWFibGVzCiBl bnRyeSBkZWZpbmluZyB0aGUgZGlyZWN0b3J5LWxvY2FsIHZhcmlhYmxlLiAgQGtiZHtNLXgK IGRlbGV0ZS1kaXItbG9jYWwtdmFyaWFibGV9IGRlbGV0ZXMgYW4gZW50cnkuICBAa2Jke00t eAogY29weS1maWxlLWxvY2Fscy10by1kaXItbG9jYWxzfSBjb3BpZXMgdGhlIGZpbGUtbG9j YWwgdmFyaWFibGVzIGluIHRoZQotY3VycmVudCBmaWxlIGludG8gQGZpbGV7LmRpci1sb2Nh bHMuZWx9LgorY3VycmVudCBmaWxlIGludG8gQGZpbGV7LmRpci1sb2NhbHMuZWx9LCBvciBA ZmlsZXsuZGlyLWxvY2Fscy0yLmVsfSBpZgordGhhdCBmaWxlIGlzIGFsc28gcHJlc2VudC4K KworV2l0aCBhIHByZWZpeCBhcmd1bWVudCwgYWxsIHRocmVlIGNvbW1hbmRzIHByb21wdCBm b3IgdGhlIGZpbGUgeW91Cit3YW50IHRvIG1vZGlmeS4gIEFsdGhvdWdoIGl0IGRvZXNuJ3Qg aGF2ZSB0byBleGlzdCwgeW91IG11c3QgZW50ZXIgYQordmFsaWQgZmlsZW5hbWUsIGVpdGhl ciBAZmlsZXsuZGlyLWxvY2Fscy5lbH0gb3IKK0BmaWxley5kaXItbG9jYWxzLTIuZWx9Lgog CiBAZmluZGV4IGRpci1sb2NhbHMtc2V0LWNsYXNzLXZhcmlhYmxlcwogQGZpbmRleCBkaXIt bG9jYWxzLXNldC1kaXJlY3RvcnktY2xhc3MKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRj L05FV1MKaW5kZXggM2Q0Y2RkODc2YjMuLmQ0ODQ2NmJlMzA1IDEwMDY0NAotLS0gYS9ldGMv TkVXUworKysgYi9ldGMvTkVXUwpAQCAtMTg3LDYgKzE4NywxMSBAQCByaWdodC1hbGlnbmVk IHRvIGlzIGNvbnRyb2xsZWQgYnkgdGhlIG5ldyB1c2VyIG9wdGlvbgogSXQgY2FuIGJlIHVz ZWQgdG8gYWRkLCByZW1vdmUgYW5kIHJlb3JkZXIgZnVuY3Rpb25zIHRoYXQgY2hhbmdlCiB0 aGUgYXBwZWFyYW5jZSBvZiBldmVyeSB0YWIgb24gdGhlIHRhYiBiYXIuCiAKKysrKworKiog TmV3IG9wdGlvbmFsIGFyZ3VtZW50IGZvciBtb2RpZnlpbmcgZGlyZWN0b3J5IGxvY2FsIHZh cmlhYmxlcworVGhlIGNvbW1hbmRzICdhZGQtZGlyLWxvY2FsLXZhcmlhYmxlJywgJ2RlbGV0 ZS1kaXItbG9jYWwtdmFyaWFibGUnIGFuZAorJ2NvcHktZmlsZS1sb2NhbHMtdG8tZGlyLWxv Y2Fscycgbm93IHRha2UgYW4gb3B0aW9uYWwgcHJlZml4IGFyZ3VtZW50LAordG8gZW50ZXIg dGhlIGZpbGUgeW91IHdhbnQgdG8gbW9kaWZ5LgogKiogTWlzY2VsbGFuZW91cwogCiAtLS0K QEAgLTEzMzcsNiArMTM0MiwxMSBAQCBTaW5jZSBjaXJjdWxhciBhbGlhcyBjaGFpbnMgbm93 IGNhbm5vdCBvY2N1ciwgJ2Z1bmN0aW9uLWFsaWFzLXAnLAogJ2luZGlyZWN0LWZ1bmN0aW9u JyBhbmQgJ2luZGlyZWN0LXZhcmlhYmxlJyB3aWxsIG5ldmVyIHNpZ25hbCBhbiBlcnJvci4K IFRoZWlyICdub2Vycm9yJyBhcmd1bWVudHMgaGF2ZSBubyBlZmZlY3QgYW5kIGFyZSB0aGVy ZWZvcmUgb2Jzb2xldGUuCiAKKy0tLQorKiogTmV3IG9wdGlvbmFsIGFyZ3VtZW50IHRvICdt b2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlJworQSA1dGggYXJndW1lbnQsIG9wdGlvbmFsLCBo YXMgYmVlbiBhZGRlZCB0bworJ21vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUnLiAgSXQgY2Fu IGJlIHVzZWQgdG8gc3BlY2lmeSB3aGljaAorZGlyLWxvY2FscyBmaWxlIHRvIG1vZGlmeS4K IAwKICogQ2hhbmdlcyBpbiBFbWFjcyAzMC4xIG9uIE5vbi1GcmVlIE9wZXJhdGluZyBTeXN0 ZW1zCiAKZGlmZiAtLWdpdCBhL2xpc3AvZmlsZXMteC5lbCBiL2xpc3AvZmlsZXMteC5lbApp bmRleCAzYmE3NjMyZDI1My4uZWYzYWRjYjljZDMgMTAwNjQ0Ci0tLSBhL2xpc3AvZmlsZXMt eC5lbAorKysgYi9saXNwL2ZpbGVzLXguZWwKQEAgLTMxLDYgKzMxLDcgQEAKIDs7OyBDb2Rl OgogCiAoZXZhbC13aGVuLWNvbXBpbGUgKHJlcXVpcmUgJ3N1YnIteCkpIDsgZm9yIHN0cmlu Zy10cmltLXJpZ2h0CisoZGVjbGFyZS1mdW5jdGlvbiBkb3NpZmllZC1maWxlLW5hbWUgImRv cy1mbnMiIChmaWxlLW5hbWUpKQogCiAMCiA7OzsgQ29tbWFuZHMgdG8gYWRkL2RlbGV0ZSBm aWxlLWxvY2FsL2RpcmVjdG9yeS1sb2NhbCB2YXJpYWJsZXMuCkBAIC00MTAsNyArNDExLDcg QEAgZGVsZXRlLWZpbGUtbG9jYWwtdmFyaWFibGUtcHJvcC1saW5lCiAKIChkZWZ2YXIgYXV0 by1pbnNlcnQpIDsgZnJvbSBhdXRvaW5zZXJ0LmVsCiAKLShkZWZ1biBtb2RpZnktZGlyLWxv Y2FsLXZhcmlhYmxlIChtb2RlIHZhcmlhYmxlIHZhbHVlIG9wKQorKGRlZnVuIG1vZGlmeS1k aXItbG9jYWwtdmFyaWFibGUgKG1vZGUgdmFyaWFibGUgdmFsdWUgb3AgJm9wdGlvbmFsIGZp bGUpCiAgICJNb2RpZnkgZGlyZWN0b3J5LWxvY2FsIFZBUklBQkxFIGluIC5kaXItbG9jYWxz LmVsIGRlcGVuZGluZyBvbiBvcGVyYXRpb24gT1AuCiAKIElmIE9QIGlzIGBhZGQtb3ItcmVw bGFjZScgdGhlbiBkZWxldGUgYWxsIGV4aXN0aW5nIHNldHRpbmdzIG9mCkBAIC00MjIsMjgg KzQyMywzNyBAQCBtb2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlCiB0aGlzIGZpbGUgaW4gdGhl IGN1cnJlbnQgZGlyZWN0b3J5LgogCiBJZiBPUCBpcyBgZGVsZXRlJyB0aGVuIGRlbGV0ZSBh bGwgZXhpc3Rpbmcgc2V0dGluZ3Mgb2YgVkFSSUFCTEUKLWZyb20gdGhlIE1PREUgYWxpc3Qg aWdub3JpbmcgdGhlIGlucHV0IGFyZ3VtZW50IFZBTFVFLiIKK2Zyb20gdGhlIE1PREUgYWxp c3QgaWdub3JpbmcgdGhlIGlucHV0IGFyZ3VtZW50IFZBTFVFLgorCitPcHRpb25hbCBhcmd1 bWVudCBGSUxFLCB3aGVuIG5vbi1uaWwsIHNwZWNpZmllcyB3aGF0IGZpbGUgdG8gbW9kaWZ5 LiAgSXQKK3Nob3VsZCBiZSBhbiBleHBhbmRlZCBmaWxlbmFtZS4iCiAgIChjYXRjaCAnZXhp dAogICAgICh1bmxlc3MgZW5hYmxlLWxvY2FsLXZhcmlhYmxlcwogICAgICAgKHRocm93ICdl eGl0IChtZXNzYWdlICJEaXJlY3RvcnktbG9jYWwgdmFyaWFibGVzIGFyZSBkaXNhYmxlZCIp KSkKLSAgICAobGV0KiAoKGRpci1vci1jYWNoZSAoYW5kIChidWZmZXItZmlsZS1uYW1lKQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAoZmlsZS1yZW1vdGUtcCAoYnVm ZmVyLWZpbGUtbmFtZSkpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGRpci1s b2NhbHMtZmluZC1maWxlIChidWZmZXItZmlsZS1uYW1lKSkpKQotICAgICAgICAgICAodmFy aWFibGVzLWZpbGUKLSAgICAgICAgICAgIDs7IElmIHRoZXJlIGFyZSBzZXZlcmFsIC5kaXIt bG9jYWxzLCB0aGUgdXNlciBwcm9iYWJseQotICAgICAgICAgICAgOzsgd2FudHMgdG8gZWRp dCB0aGUgbGFzdCBvbmUgKHRoZSBoaWdoZXN0IHByaW9yaXR5KS4KLSAgICAgICAgICAgIChj b25kICgoc3RyaW5ncCBkaXItb3ItY2FjaGUpCi0gICAgICAgICAgICAgICAgICAgKGNhciAo bGFzdCAoZGlyLWxvY2Fscy0tYWxsLWZpbGVzIGRpci1vci1jYWNoZSkpKSkKLSAgICAgICAg ICAgICAgICAgICgoY29uc3AgZGlyLW9yLWNhY2hlKQk7IHJlc3VsdCBmcm9tIGNhY2hlCi0g ICAgICAgICAgICAgICAgICAgOzsgSWYgY2FjaGUgZWxlbWVudCBoYXMgYW4gbXRpbWUsIGFz c3VtZSBpdCBjYW1lCi0gICAgICAgICAgICAgICAgICAgOzsgZnJvbSBhIGZpbGUuICBPdGhl cndpc2UsIGFzc3VtZSBpdCB3YXMgc2V0Ci0gICAgICAgICAgICAgICAgICAgOzsgZGlyZWN0 bHkuCi0gICAgICAgICAgICAgICAgICAgKGlmIChudGggMiBkaXItb3ItY2FjaGUpCi0gICAg ICAgICAgICAgICAgICAgICAgIChjYXIgKGxhc3QgKGRpci1sb2NhbHMtLWFsbC1maWxlcyAo Y2FyIGRpci1vci1jYWNoZSkpKSkKLSAgICAgICAgICAgICAgICAgICAgIChjYWRyIGRpci1v ci1jYWNoZSkpKQotICAgICAgICAgICAgICAgICAgOzsgVHJ5IHRvIG1ha2UgYSBwcm9wZXIg ZmlsZS1uYW1lLgotICAgICAgICAgICAgICAgICAgKHQgKGV4cGFuZC1maWxlLW5hbWUgZGly LWxvY2Fscy1maWxlKSkpKQotICAgICAgICAgICB2YXJpYWJsZXMpCisgICAgKGxldCAoKHZh cmlhYmxlcy1maWxlCisgICAgICAgICAgIChpZiAoc3RyaW5ncCBmaWxlKQorICAgICAgICAg ICAgICAgZmlsZQorICAgICAgICAgICAgIChsZXQgKChkaXItb3ItY2FjaGUKKyAgICAgICAg ICAgICAgICAgICAgKGFuZCAoYnVmZmVyLWZpbGUtbmFtZSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAobm90IChmaWxlLXJlbW90ZS1wIChidWZmZXItZmlsZS1uYW1lKSkpCisgICAg ICAgICAgICAgICAgICAgICAgICAgKGRpci1sb2NhbHMtZmluZC1maWxlIChidWZmZXItZmls ZS1uYW1lKSkpKSkKKyAgICAgICAgICAgICAgIDs7IElmIHRoZXJlIGFyZSBzZXZlcmFsIC5k aXItbG9jYWxzLCB0aGUgdXNlciBwcm9iYWJseQorICAgICAgICAgICAgICAgOzsgd2FudHMg dG8gZWRpdCB0aGUgbGFzdCBvbmUgKHRoZSBoaWdoZXN0IHByaW9yaXR5KS4KKyAgICAgICAg ICAgICAgIChjb25kCisgICAgICAgICAgICAgICAgKChzdHJpbmdwIGRpci1vci1jYWNoZSkK KyAgICAgICAgICAgICAgICAgKGNhciAobGFzdCAoZGlyLWxvY2Fscy0tYWxsLWZpbGVzIGRp ci1vci1jYWNoZSkpKSkKKyAgICAgICAgICAgICAgICAoKGNvbnNwIGRpci1vci1jYWNoZSkJ OyByZXN1bHQgZnJvbSBjYWNoZQorICAgICAgICAgICAgICAgICA7OyBJZiBjYWNoZSBlbGVt ZW50IGhhcyBhbiBtdGltZSwgYXNzdW1lIGl0IGNhbWUKKyAgICAgICAgICAgICAgICAgOzsg ZnJvbSBhIGZpbGUuICBPdGhlcndpc2UsIGFzc3VtZSBpdCB3YXMgc2V0CisgICAgICAgICAg ICAgICAgIDs7IGRpcmVjdGx5LgorICAgICAgICAgICAgICAgICAoaWYgKG50aCAyIGRpci1v ci1jYWNoZSkKKyAgICAgICAgICAgICAgICAgICAgIChjYXIgKGxhc3QgKGRpci1sb2NhbHMt LWFsbC1maWxlcyAoY2FyIGRpci1vci1jYWNoZSkpKSkKKyAgICAgICAgICAgICAgICAgICAo Y2FkciBkaXItb3ItY2FjaGUpKSkKKyAgICAgICAgICAgICAgICA7OyBUcnkgdG8gbWFrZSBh IHByb3BlciBmaWxlLW5hbWUuCisgICAgICAgICAgICAgICAgKHQgKGV4cGFuZC1maWxlLW5h bWUgKGlmIChlcSBzeXN0ZW0tdHlwZSAnbXMtZG9zKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoZG9zaWZpZWQtZmlsZS1uYW1lIGRpci1sb2NhbHMtZmls ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpci1sb2NhbHMt ZmlsZSkpKSkpKSkKKyAgICAgICAgICB2YXJpYWJsZXMpCiAgICAgICA7OyBJIGNhbid0IGJl IGJvdGhlcmVkIHRvIGhhbmRsZSB0aGlzIGNhc2UgcmlnaHQgbm93LgogICAgICAgOzsgRGly IGxvY2FscyB3ZXJlIHNldCBkaXJlY3RseSBmcm9tIGEgY2xhc3MuICBZb3UgbmVlZCB0bwog ICAgICAgOzsgZGlyZWN0bHkgbW9kaWZ5IHRoZSBjbGFzcyBpbiBkaXItbG9jYWxzLWNsYXNz LWFsaXN0LgpAQCAtNTI3LDMzICs1MzcsNjkgQEAgZGlyLWxvY2Fscy10by1zdHJpbmcKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIG1vZGUtdmFyaWFibGVz KSAiXG4iKSkpKQogICAgICAgICAgICB2YXJpYWJsZXMgIlxuIikpKQogCisoZGVmdW4gcmVh ZC1kaXItbG9jYWxzLWZpbGUgKCkKKyAgIlJlYWQgYSBkaXItbG9jYWxzIGZpbGVuYW1lIHVz aW5nIGNvbXBsZXRpb24uCitJbnRlbmRlZCB0byBiZSB1c2VkIGluIHRoZSBgaW50ZXJhY3Rp dmUnIHNwZWMgb2YgYGFkZC1kaXItbG9jYWwtdmFyaWFibGUnLAorYGRlbGV0ZS1kaXItbG9j YWwtdmFyaWFibGUnIGFuZCBgY29weS1maWxlLWxvY2Fscy10by1kaXItbG9jYWxzJy4KKwor UmV0dXJucyB0aGUgZmlsZW5hbWUsIGV4cGFuZGVkLiIKKyAgKGV4cGFuZC1maWxlLW5hbWUK KyAgIChyZWFkLWZpbGUtbmFtZSAiRmlsZSIgbmlsIG5pbAorICAgICAgICAgICAgICAgICAg IChsYW1iZGEgKGZuYW1lKQorICAgICAgICAgICAgICAgICAgICAgKG1lbWJlciAoZmlsZS1u YW1lLW5vbmRpcmVjdG9yeSBmbmFtZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGxpc3QgZGlyLWxvY2Fscy1maWxlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICIuZWwkIiAiLTIuZWwiIGRpci1sb2NhbHMtZmlsZSkpKSkKKyAgICAg ICAgICAgICAgICAgICBkaXItbG9jYWxzLWZpbGUpKSkKKwogOzs7IyMjYXV0b2xvYWQKLShk ZWZ1biBhZGQtZGlyLWxvY2FsLXZhcmlhYmxlIChtb2RlIHZhcmlhYmxlIHZhbHVlKQotICAi QWRkIGRpcmVjdG9yeS1sb2NhbCBWQVJJQUJMRSB3aXRoIGl0cyBWQUxVRSBhbmQgTU9ERSB0 byAuZGlyLWxvY2Fscy5lbC4iCisoZGVmdW4gYWRkLWRpci1sb2NhbC12YXJpYWJsZSAobW9k ZSB2YXJpYWJsZSB2YWx1ZSAmb3B0aW9uYWwgZmlsZSkKKyAgIkFkZCBkaXJlY3RvcnktbG9j YWwgVkFSSUFCTEUgd2l0aCBpdHMgVkFMVUUgYW5kIE1PREUgdG8gLmRpci1sb2NhbHMuZWwu CisKK1dpdGggYSBwcmVmaXggYXJndW1lbnQsIHByb21wdCBmb3IgdGhlIGZpbGUgdG8gbW9k aWZ5LgorCitXaGVuIGNhbGxlZCBmcm9tIExpc3AsIEZJTEUgbWF5IGJlIHRoZSBleHBhbmRl ZCBuYW1lIG9mIHRoZSBkaXItbG9jYWxzIGZpbGUKK3doZXJlIHRvIGFkZCBWQVJJQUJMRS4i CiAgIChpbnRlcmFjdGl2ZQogICAgKGxldCAodmFyaWFibGUpCiAgICAgIChsaXN0CiAgICAg ICAocmVhZC1maWxlLWxvY2FsLXZhcmlhYmxlLW1vZGUpCiAgICAgICAoc2V0cSB2YXJpYWJs ZSAocmVhZC1maWxlLWxvY2FsLXZhcmlhYmxlICJBZGQgZGlyZWN0b3J5LWxvY2FsIHZhcmlh YmxlIikpCi0gICAgICAocmVhZC1maWxlLWxvY2FsLXZhcmlhYmxlLXZhbHVlIHZhcmlhYmxl KSkpKQotICAobW9kaWZ5LWRpci1sb2NhbC12YXJpYWJsZSBtb2RlIHZhcmlhYmxlIHZhbHVl ICdhZGQtb3ItcmVwbGFjZSkpCisgICAgICAocmVhZC1maWxlLWxvY2FsLXZhcmlhYmxlLXZh bHVlIHZhcmlhYmxlKQorICAgICAgKHdoZW4gY3VycmVudC1wcmVmaXgtYXJnCisgICAgICAg IChyZWFkLWRpci1sb2NhbHMtZmlsZSkpKSkpCisgIChtb2RpZnktZGlyLWxvY2FsLXZhcmlh YmxlIG1vZGUgdmFyaWFibGUgdmFsdWUgJ2FkZC1vci1yZXBsYWNlIGZpbGUpKQogCiA7Ozsj IyNhdXRvbG9hZAotKGRlZnVuIGRlbGV0ZS1kaXItbG9jYWwtdmFyaWFibGUgKG1vZGUgdmFy aWFibGUpCi0gICJEZWxldGUgYWxsIE1PREUgc2V0dGluZ3Mgb2YgZmlsZS1sb2NhbCBWQVJJ QUJMRSBmcm9tIC5kaXItbG9jYWxzLmVsLiIKKyhkZWZ1biBkZWxldGUtZGlyLWxvY2FsLXZh cmlhYmxlIChtb2RlIHZhcmlhYmxlICZvcHRpb25hbCBmaWxlKQorICAiRGVsZXRlIGFsbCBN T0RFIHNldHRpbmdzIG9mIGRpci1sb2NhbCBWQVJJQUJMRSBmcm9tIC5kaXItbG9jYWxzLmVs LgorCitXaXRoIGEgcHJlZml4IGFyZ3VtZW50LCBwcm9tcHQgZm9yIHRoZSBmaWxlIHRvIG1v ZGlmeS4KKworV2hlbiBjYWxsZWQgZnJvbSBMaXNwLCBGSUxFIG1heSBiZSB0aGUgZXhwYW5k ZWQgbmFtZSBvZiB0aGUgZGlyLWxvY2FscyBmaWxlCitmcm9tIHdoZXJlIHRvIGRlbGV0ZSBW QVJJQUJMRS4iCiAgIChpbnRlcmFjdGl2ZQogICAgKGxpc3QKICAgICAocmVhZC1maWxlLWxv Y2FsLXZhcmlhYmxlLW1vZGUpCi0gICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZSAiRGVs ZXRlIGRpcmVjdG9yeS1sb2NhbCB2YXJpYWJsZSIpKSkKLSAgKG1vZGlmeS1kaXItbG9jYWwt dmFyaWFibGUgbW9kZSB2YXJpYWJsZSBuaWwgJ2RlbGV0ZSkpCisgICAgKHJlYWQtZmlsZS1s b2NhbC12YXJpYWJsZSAiRGVsZXRlIGRpcmVjdG9yeS1sb2NhbCB2YXJpYWJsZSIpCisgICAg KHdoZW4gY3VycmVudC1wcmVmaXgtYXJnCisgICAgICAocmVhZC1kaXItbG9jYWxzLWZpbGUp KSkpCisgIChtb2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlIG1vZGUgdmFyaWFibGUgbmlsICdk ZWxldGUgZmlsZSkpCiAKIDs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gY29weS1maWxlLWxvY2Fs cy10by1kaXItbG9jYWxzICgpCi0gICJDb3B5IGZpbGUtbG9jYWwgdmFyaWFibGVzIHRvIC5k aXItbG9jYWxzLmVsLiIKLSAgKGludGVyYWN0aXZlKQorKGRlZnVuIGNvcHktZmlsZS1sb2Nh bHMtdG8tZGlyLWxvY2FscyAoJm9wdGlvbmFsIGZpbGUpCisgICJDb3B5IGZpbGUtbG9jYWwg dmFyaWFibGVzIHRvIC5kaXItbG9jYWxzLmVsLgorCitXaXRoIGEgcHJlZml4IGFyZ3VtZW50 LCBwcm9tcHQgZm9yIHRoZSBmaWxlIHRvIG1vZGlmeS4KKworV2hlbiBjYWxsZWQgZnJvbSBM aXNwLCBGSUxFIG1heSBiZSB0aGUgZXhwYW5kZWQgbmFtZSBvZiB0aGUgZGlyLWxvY2FscyBm aWxlCit3aGVyZSB0byBjb3B5IHRoZSBmaWxlLWxvY2FsIHZhcmlhYmxlcy4iCisgIChpbnRl cmFjdGl2ZQorICAgKGxpc3QgKHdoZW4gY3VycmVudC1wcmVmaXgtYXJnCisgICAgICAgICAg IChyZWFkLWRpci1sb2NhbHMtZmlsZSkpKSkKICAgKGRvbGlzdCAoZWx0IGZpbGUtbG9jYWwt dmFyaWFibGVzLWFsaXN0KQogICAgICh1bmxlc3MgKGFzc3EgKGNhciBlbHQpIGRpci1sb2Nh bC12YXJpYWJsZXMtYWxpc3QpCi0gICAgICAoYWRkLWRpci1sb2NhbC12YXJpYWJsZSBtYWpv ci1tb2RlIChjYXIgZWx0KSAoY2RyIGVsdCkpKSkpCisgICAgICAoYWRkLWRpci1sb2NhbC12 YXJpYWJsZSBtYWpvci1tb2RlIChjYXIgZWx0KSAoY2RyIGVsdCkgZmlsZSkpKSkKIAogOzs7 IyMjYXV0b2xvYWQKIChkZWZ1biBjb3B5LWRpci1sb2NhbHMtdG8tZmlsZS1sb2NhbHMgKCkK LS0gCjIuMzQuMQoK --------------EFmtouJOj1YeXyDcPviGJ66C-- From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Mauro Aranda Cc: Eli Zaretskii , 66663@debbugs.gnu.org Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.169791267428234 (code B ref 66663); Sat, 21 Oct 2023 18:25:02 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 18:24:34 +0000 Received: from localhost ([127.0.0.1]:45016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quGeH-0007LJ-MT for submit@debbugs.gnu.org; Sat, 21 Oct 2023 14:24:33 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]:48009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quGeF-0007L4-He for 66663@debbugs.gnu.org; Sat, 21 Oct 2023 14:24:32 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 143B2E0003; Sat, 21 Oct 2023 18:23:56 +0000 (UTC) From: Juri Linkov In-Reply-To: (Mauro Aranda's message of "Sat, 21 Oct 2023 11:06:28 -0300") Organization: LINKOV.NET References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> <83o7gsqh3i.fsf@gnu.org> <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> Date: Sat, 21 Oct 2023 21:21:17 +0300 Message-ID: <86zg0bu99e.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-GND-Sasl: juri@linkov.net X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > I reworked the patch to implement that UI instead. Patch attached. Thanks, some comments: > +(defun read-dir-locals-file () > + "Read a dir-locals filename using completion. > +Intended to be used in the `interactive' spec of `add-dir-local-variable', > +`delete-dir-local-variable' and `copy-file-locals-to-dir-locals'. > + > +Returns the filename, expanded." > + (expand-file-name > + (read-file-name "File" nil nil The prompt needs a colon. > + (lambda (fname) > + (member (file-name-nondirectory fname) > + (list dir-locals-file > + (replace-regexp-in-string > + ".el$" "-2.el" dir-locals-file)))) > + dir-locals-file))) This needs to be run in the project's root directory where the dir-locals file is saved. Probably it's not easy to find the root without using project.el. But when one of the files already exists (either .dir-locals.el or .dir-locals-2.el), then better to use the directory of the existing file by default. From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Mauro Aranda Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Oct 2023 22:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Juri Linkov Cc: Eli Zaretskii , 66663@debbugs.gnu.org Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.16979262543088 (code B ref 66663); Sat, 21 Oct 2023 22:11:01 +0000 Received: (at 66663) by debbugs.gnu.org; 21 Oct 2023 22:10:54 +0000 Received: from localhost ([127.0.0.1]:45199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quKBJ-0000nk-Qq for submit@debbugs.gnu.org; Sat, 21 Oct 2023 18:10:54 -0400 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]:53638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quKBE-0000nQ-3j for 66663@debbugs.gnu.org; Sat, 21 Oct 2023 18:10:52 -0400 Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6cd09663b1cso1323045a34.3 for <66663@debbugs.gnu.org>; Sat, 21 Oct 2023 15:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697926214; x=1698531014; darn=debbugs.gnu.org; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=nwQys1N4XcRitS+FiYeTK25EGCO0N5+HV7PWyO0eyL8=; b=cNj6vUYN+1BDDZ27fpqepkFs0fGJv2S80/oukW35GGzZtZzpkJUpbixzbG+cLCQx1N d8GvwgFHZ4e+w+nqF3AQDybHbTIPrzJFTa1lDQ/h4VfUE0u9DVEtOLYtbViCRfIAoOaL 0FJLzMl9o5m70elzTTae8jZcu8orU/57qoOxpdbGf4T3J0L22wVvWdxjvExMagi2Gtko 8tqbJbQqXBw9hUXYooPBDzP+t4IxvhN8UU/ucqoD+tuF69ibmJ8vX3CnuQoO8tLhNAAe f+yGAH7n0wgBXQVqXxAhLRKlpzS4AJNQXEdup5GaIjHlYzszrelMgiXRD3h6MDFatdMO RDmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697926214; x=1698531014; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nwQys1N4XcRitS+FiYeTK25EGCO0N5+HV7PWyO0eyL8=; b=r0cwXFBPBwBCanwOdosZ4FlqxqqqH2xh01WGxX2y5cAvIl4XprIHinhhX4cE/Hnb7D M41GDDSJ5AwsqYFmzm/dx9Wv/KHM2fHgI1nii2fChcPMuzUWx3IuuTwwqfGCGsj2AvaK qd8WcjssvT8YpW4sD61jefKJkvAMPfT363AvTCuc8QbXBT9QeNJiogC+UbTdoJeUj5eS +6nLG0BGeNqw5uI74xdC+7K2E5FKdBfqTMBnDPh3pJU4mxGXZgyhQOnfUwQMQOqWETgF 33mKWsjUVigFxsB9KMh7wcPAiV1I+wQWkaDjnOSJ7whps/+YV5FkCAD9ifzTl0iQsCh7 oxEQ== X-Gm-Message-State: AOJu0Yx+xrIlPEZw+ZnfqnI7GBRdwUI35WGZ7d+UN3LiEfa+sviVqwh5 OoLFmkhvxNjS9uiBV6NyLgY= X-Google-Smtp-Source: AGHT+IG1KGoFh+0RRM/E2rEwq+VdWfi4O5Xk6oSr4dhHht/3AXglPETdkHATCEPJzQSgLCqj+J4ldA== X-Received: by 2002:a05:6358:4404:b0:139:d5b9:87d3 with SMTP id z4-20020a056358440400b00139d5b987d3mr5601723rwc.5.1697926214135; Sat, 21 Oct 2023 15:10:14 -0700 (PDT) Received: from [192.168.0.234] ([152.168.142.156]) by smtp.gmail.com with ESMTPSA id a14-20020aa7970e000000b0069353ac3d38sm3693913pfg.69.2023.10.21.15.10.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Oct 2023 15:10:13 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------4cCsFCOpWGQc5mFRdJvqeu93" Message-ID: <8b4f9985-6bde-40e8-bd89-e74084e823a5@gmail.com> Date: Sat, 21 Oct 2023 19:10:10 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> <83o7gsqh3i.fsf@gnu.org> <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> <86zg0bu99e.fsf@mail.linkov.net> From: Mauro Aranda In-Reply-To: <86zg0bu99e.fsf@mail.linkov.net> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------4cCsFCOpWGQc5mFRdJvqeu93 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 21/10/23 15:21, Juri Linkov wrote: >> +(defun read-dir-locals-file () >> +  "Read a dir-locals filename using completion. >> +Intended to be used in the `interactive' spec of `add-dir-local-variable', >> +`delete-dir-local-variable' and `copy-file-locals-to-dir-locals'. >> + >> +Returns the filename, expanded." >> +  (expand-file-name >> +   (read-file-name "File" nil nil > > The prompt needs a colon. Fixed. >> +                   (lambda (fname) >> +                     (member (file-name-nondirectory fname) >> +                             (list dir-locals-file >> + (replace-regexp-in-string >> +                                    ".el$" "-2.el" dir-locals-file)))) >> +                   dir-locals-file))) > > This needs to be run in the project's root directory > where the dir-locals file is saved.  Probably it's not easy > to find the root without using project.el.  But when one of the > files already exists (either .dir-locals.el or .dir-locals-2.el), > then better to use the directory of the existing file by default. In this new patch, I went for using it if already available and we couldn't find an existing file by other means. --------------4cCsFCOpWGQc5mFRdJvqeu93 Content-Type: text/x-patch; charset=UTF-8; name="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.patch" Content-Disposition: attachment; filename*0="0001-Allow-specifying-the-dir-locals-file-to-edit-Bug-666.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA4YTA4NDU1N2NhNDY0N2U4MmVmZmM3MDA3OTc0YWMxYjFjNjZhMjdhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMjEgT2N0IDIwMjMgMTE6MDI6MzYgLTAzMDAKU3ViamVjdDog W1BBVENIXSBBbGxvdyBzcGVjaWZ5aW5nIHRoZSBkaXIgbG9jYWxzIGZpbGUgdG8gZWRpdCAo QnVnIzY2NjYzKQoKKiBsaXNwL2ZpbGVzLXguZWwgKG1vZGlmeS1kaXItbG9jYWwtdmFyaWFi bGUpOiBUYWtlIGEgNXRoIG9wdGlvbmFsCmFyZ3VtZW50LCB0aGUgZmlsZW5hbWUgb2YgdGhl IGRpciBsb2NhbHMgZmlsZSB0byBtb2RpZnkuCihyZWFkLWRpci1sb2NhbHMtZmlsZSk6IE5l dyBmdW5jdGlvbi4KKGFkZC1kaXItbG9jYWwtdmFyaWFibGUsIGRlbGV0ZS1kaXItbG9jYWwt dmFyaWFibGUpCihjb3B5LWZpbGUtbG9jYWxzLXRvLWRpci1sb2NhbHMpOiBPcHRpb25hbGx5 IHJlYWQgdGhlIGZpbGVuYW1lIHRvCm1vZGlmeSwgYW5kIHBhc3MgaXQgdG8gbW9kaWZ5LWRp ci1sb2NhbC12YXJpYWJsZS4KKiBldGMvTkVXUzogQW5ub3VuY2UgdGhlIGNoYW5nZS4KKiBk b2MvZW1hY3MvY3VzdG9tLnRleGkgKERpcmVjdG9yeSBWYXJpYWJsZXMpOiBEb2N1bWVudCB0 aGUgbmV3CmZ1bmN0aW9uYWxpdHkuCi0tLQogZG9jL2VtYWNzL2N1c3RvbS50ZXhpIHwgICA4 ICsrLQogZXRjL05FV1MgICAgICAgICAgICAgIHwgIDEwICsrKysKIGxpc3AvZmlsZXMteC5l bCAgICAgICB8IDExNyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0KIDMgZmlsZXMgY2hhbmdlZCwgMTAyIGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9jdXN0b20udGV4aSBiL2RvYy9lbWFjcy9jdXN0 b20udGV4aQppbmRleCA4YzMwZjI2YmJmNy4uYWRlY2M4NzMxNjMgMTAwNjQ0Ci0tLSBhL2Rv Yy9lbWFjcy9jdXN0b20udGV4aQorKysgYi9kb2MvZW1hY3MvY3VzdG9tLnRleGkKQEAgLTE1 MDcsNyArMTUwNywxMyBAQCBEaXJlY3RvcnkgVmFyaWFibGVzCiBlbnRyeSBkZWZpbmluZyB0 aGUgZGlyZWN0b3J5LWxvY2FsIHZhcmlhYmxlLiAgQGtiZHtNLXgKIGRlbGV0ZS1kaXItbG9j YWwtdmFyaWFibGV9IGRlbGV0ZXMgYW4gZW50cnkuICBAa2Jke00teAogY29weS1maWxlLWxv Y2Fscy10by1kaXItbG9jYWxzfSBjb3BpZXMgdGhlIGZpbGUtbG9jYWwgdmFyaWFibGVzIGlu IHRoZQotY3VycmVudCBmaWxlIGludG8gQGZpbGV7LmRpci1sb2NhbHMuZWx9LgorY3VycmVu dCBmaWxlIGludG8gQGZpbGV7LmRpci1sb2NhbHMuZWx9LCBvciBAZmlsZXsuZGlyLWxvY2Fs cy0yLmVsfSBpZgordGhhdCBmaWxlIGlzIGFsc28gcHJlc2VudC4KKworV2l0aCBhIHByZWZp eCBhcmd1bWVudCwgYWxsIHRocmVlIGNvbW1hbmRzIHByb21wdCBmb3IgdGhlIGZpbGUgeW91 Cit3YW50IHRvIG1vZGlmeS4gIEFsdGhvdWdoIGl0IGRvZXNuJ3QgaGF2ZSB0byBleGlzdCwg eW91IG11c3QgZW50ZXIgYQordmFsaWQgZmlsZW5hbWUsIGVpdGhlciBAZmlsZXsuZGlyLWxv Y2Fscy5lbH0gb3IKK0BmaWxley5kaXItbG9jYWxzLTIuZWx9LgogCiBAZmluZGV4IGRpci1s b2NhbHMtc2V0LWNsYXNzLXZhcmlhYmxlcwogQGZpbmRleCBkaXItbG9jYWxzLXNldC1kaXJl Y3RvcnktY2xhc3MKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggNWQ0 MmQ4OGZiNjAuLmEzNjM5NjIwZWJiIDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMv TkVXUwpAQCAtMTg3LDYgKzE4NywxMSBAQCByaWdodC1hbGlnbmVkIHRvIGlzIGNvbnRyb2xs ZWQgYnkgdGhlIG5ldyB1c2VyIG9wdGlvbgogSXQgY2FuIGJlIHVzZWQgdG8gYWRkLCByZW1v dmUgYW5kIHJlb3JkZXIgZnVuY3Rpb25zIHRoYXQgY2hhbmdlCiB0aGUgYXBwZWFyYW5jZSBv ZiBldmVyeSB0YWIgb24gdGhlIHRhYiBiYXIuCiAKKysrKworKiogTmV3IG9wdGlvbmFsIGFy Z3VtZW50IGZvciBtb2RpZnlpbmcgZGlyZWN0b3J5IGxvY2FsIHZhcmlhYmxlcworVGhlIGNv bW1hbmRzICdhZGQtZGlyLWxvY2FsLXZhcmlhYmxlJywgJ2RlbGV0ZS1kaXItbG9jYWwtdmFy aWFibGUnIGFuZAorJ2NvcHktZmlsZS1sb2NhbHMtdG8tZGlyLWxvY2Fscycgbm93IHRha2Ug YW4gb3B0aW9uYWwgcHJlZml4IGFyZ3VtZW50LAordG8gZW50ZXIgdGhlIGZpbGUgeW91IHdh bnQgdG8gbW9kaWZ5LgogKiogTWlzY2VsbGFuZW91cwogCiAtLS0KQEAgLTEzNTgsNiArMTM2 MywxMSBAQCBUaGVpciAnbm9lcnJvcicgYXJndW1lbnRzIGhhdmUgbm8gZWZmZWN0IGFuZCBh cmUgdGhlcmVmb3JlIG9ic29sZXRlLgogV2hlbiBzdXBwbGllZCB3aXRoICc6ZGVmYXVsdC1s YW5ndWFnZSBMQU5HVUFHRScsIHJ1bGVzIGFmdGVyIGl0IHdpbGwKIGRlZmF1bHQgdG8gdXNl ICdMQU5HVUFHRScuCiAKKy0tLQorKiogTmV3IG9wdGlvbmFsIGFyZ3VtZW50IHRvICdtb2Rp ZnktZGlyLWxvY2FsLXZhcmlhYmxlJworQSA1dGggYXJndW1lbnQsIG9wdGlvbmFsLCBoYXMg YmVlbiBhZGRlZCB0bworJ21vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUnLiAgSXQgY2FuIGJl IHVzZWQgdG8gc3BlY2lmeSB3aGljaAorZGlyLWxvY2FscyBmaWxlIHRvIG1vZGlmeS4KIAwK ICogQ2hhbmdlcyBpbiBFbWFjcyAzMC4xIG9uIE5vbi1GcmVlIE9wZXJhdGluZyBTeXN0ZW1z CiAKZGlmZiAtLWdpdCBhL2xpc3AvZmlsZXMteC5lbCBiL2xpc3AvZmlsZXMteC5lbAppbmRl eCAzYmE3NjMyZDI1My4uZjZmYmQ0NGNlMjEgMTAwNjQ0Ci0tLSBhL2xpc3AvZmlsZXMteC5l bAorKysgYi9saXNwL2ZpbGVzLXguZWwKQEAgLTMxLDYgKzMxLDggQEAKIDs7OyBDb2RlOgog CiAoZXZhbC13aGVuLWNvbXBpbGUgKHJlcXVpcmUgJ3N1YnIteCkpIDsgZm9yIHN0cmluZy10 cmltLXJpZ2h0CisoZGVjbGFyZS1mdW5jdGlvbiBkb3NpZmllZC1maWxlLW5hbWUgImRvcy1m bnMiIChmaWxlLW5hbWUpKQorKGRlY2xhcmUtZnVuY3Rpb24gcHJvamVjdC1yb290ICJwcm9q ZWN0IiAocHJvamVjdCkpCiAKIAwKIDs7OyBDb21tYW5kcyB0byBhZGQvZGVsZXRlIGZpbGUt bG9jYWwvZGlyZWN0b3J5LWxvY2FsIHZhcmlhYmxlcy4KQEAgLTQxMCw3ICs0MTIsNyBAQCBk ZWxldGUtZmlsZS1sb2NhbC12YXJpYWJsZS1wcm9wLWxpbmUKIAogKGRlZnZhciBhdXRvLWlu c2VydCkgOyBmcm9tIGF1dG9pbnNlcnQuZWwKIAotKGRlZnVuIG1vZGlmeS1kaXItbG9jYWwt dmFyaWFibGUgKG1vZGUgdmFyaWFibGUgdmFsdWUgb3ApCisoZGVmdW4gbW9kaWZ5LWRpci1s b2NhbC12YXJpYWJsZSAobW9kZSB2YXJpYWJsZSB2YWx1ZSBvcCAmb3B0aW9uYWwgZmlsZSkK ICAgIk1vZGlmeSBkaXJlY3RvcnktbG9jYWwgVkFSSUFCTEUgaW4gLmRpci1sb2NhbHMuZWwg ZGVwZW5kaW5nIG9uIG9wZXJhdGlvbiBPUC4KIAogSWYgT1AgaXMgYGFkZC1vci1yZXBsYWNl JyB0aGVuIGRlbGV0ZSBhbGwgZXhpc3Rpbmcgc2V0dGluZ3Mgb2YKQEAgLTQyMiwyOCArNDI0 LDM3IEBAIG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUKIHRoaXMgZmlsZSBpbiB0aGUgY3Vy cmVudCBkaXJlY3RvcnkuCiAKIElmIE9QIGlzIGBkZWxldGUnIHRoZW4gZGVsZXRlIGFsbCBl eGlzdGluZyBzZXR0aW5ncyBvZiBWQVJJQUJMRQotZnJvbSB0aGUgTU9ERSBhbGlzdCBpZ25v cmluZyB0aGUgaW5wdXQgYXJndW1lbnQgVkFMVUUuIgorZnJvbSB0aGUgTU9ERSBhbGlzdCBp Z25vcmluZyB0aGUgaW5wdXQgYXJndW1lbnQgVkFMVUUuCisKK09wdGlvbmFsIGFyZ3VtZW50 IEZJTEUsIHdoZW4gbm9uLW5pbCwgc3BlY2lmaWVzIHdoYXQgZmlsZSB0byBtb2RpZnkuICBJ dAorc2hvdWxkIGJlIGFuIGV4cGFuZGVkIGZpbGVuYW1lLiIKICAgKGNhdGNoICdleGl0CiAg ICAgKHVubGVzcyBlbmFibGUtbG9jYWwtdmFyaWFibGVzCiAgICAgICAodGhyb3cgJ2V4aXQg KG1lc3NhZ2UgIkRpcmVjdG9yeS1sb2NhbCB2YXJpYWJsZXMgYXJlIGRpc2FibGVkIikpKQot ICAgIChsZXQqICgoZGlyLW9yLWNhY2hlIChhbmQgKGJ1ZmZlci1maWxlLW5hbWUpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAobm90IChmaWxlLXJlbW90ZS1wIChidWZmZXIt ZmlsZS1uYW1lKSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZGlyLWxvY2Fs cy1maW5kLWZpbGUgKGJ1ZmZlci1maWxlLW5hbWUpKSkpCi0gICAgICAgICAgICh2YXJpYWJs ZXMtZmlsZQotICAgICAgICAgICAgOzsgSWYgdGhlcmUgYXJlIHNldmVyYWwgLmRpci1sb2Nh bHMsIHRoZSB1c2VyIHByb2JhYmx5Ci0gICAgICAgICAgICA7OyB3YW50cyB0byBlZGl0IHRo ZSBsYXN0IG9uZSAodGhlIGhpZ2hlc3QgcHJpb3JpdHkpLgotICAgICAgICAgICAgKGNvbmQg KChzdHJpbmdwIGRpci1vci1jYWNoZSkKLSAgICAgICAgICAgICAgICAgICAoY2FyIChsYXN0 IChkaXItbG9jYWxzLS1hbGwtZmlsZXMgZGlyLW9yLWNhY2hlKSkpKQotICAgICAgICAgICAg ICAgICAgKChjb25zcCBkaXItb3ItY2FjaGUpCTsgcmVzdWx0IGZyb20gY2FjaGUKLSAgICAg ICAgICAgICAgICAgICA7OyBJZiBjYWNoZSBlbGVtZW50IGhhcyBhbiBtdGltZSwgYXNzdW1l IGl0IGNhbWUKLSAgICAgICAgICAgICAgICAgICA7OyBmcm9tIGEgZmlsZS4gIE90aGVyd2lz ZSwgYXNzdW1lIGl0IHdhcyBzZXQKLSAgICAgICAgICAgICAgICAgICA7OyBkaXJlY3RseS4K LSAgICAgICAgICAgICAgICAgICAoaWYgKG50aCAyIGRpci1vci1jYWNoZSkKLSAgICAgICAg ICAgICAgICAgICAgICAgKGNhciAobGFzdCAoZGlyLWxvY2Fscy0tYWxsLWZpbGVzIChjYXIg ZGlyLW9yLWNhY2hlKSkpKQotICAgICAgICAgICAgICAgICAgICAgKGNhZHIgZGlyLW9yLWNh Y2hlKSkpCi0gICAgICAgICAgICAgICAgICA7OyBUcnkgdG8gbWFrZSBhIHByb3BlciBmaWxl LW5hbWUuCi0gICAgICAgICAgICAgICAgICAodCAoZXhwYW5kLWZpbGUtbmFtZSBkaXItbG9j YWxzLWZpbGUpKSkpCi0gICAgICAgICAgIHZhcmlhYmxlcykKKyAgICAobGV0ICgodmFyaWFi bGVzLWZpbGUKKyAgICAgICAgICAgKGlmIChzdHJpbmdwIGZpbGUpCisgICAgICAgICAgICAg ICBmaWxlCisgICAgICAgICAgICAgKGxldCAoKGRpci1vci1jYWNoZQorICAgICAgICAgICAg ICAgICAgICAoYW5kIChidWZmZXItZmlsZS1uYW1lKQorICAgICAgICAgICAgICAgICAgICAg ICAgIChub3QgKGZpbGUtcmVtb3RlLXAgKGJ1ZmZlci1maWxlLW5hbWUpKSkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAoZGlyLWxvY2Fscy1maW5kLWZpbGUgKGJ1ZmZlci1maWxlLW5h bWUpKSkpKQorICAgICAgICAgICAgICAgOzsgSWYgdGhlcmUgYXJlIHNldmVyYWwgLmRpci1s b2NhbHMsIHRoZSB1c2VyIHByb2JhYmx5CisgICAgICAgICAgICAgICA7OyB3YW50cyB0byBl ZGl0IHRoZSBsYXN0IG9uZSAodGhlIGhpZ2hlc3QgcHJpb3JpdHkpLgorICAgICAgICAgICAg ICAgKGNvbmQKKyAgICAgICAgICAgICAgICAoKHN0cmluZ3AgZGlyLW9yLWNhY2hlKQorICAg ICAgICAgICAgICAgICAoY2FyIChsYXN0IChkaXItbG9jYWxzLS1hbGwtZmlsZXMgZGlyLW9y LWNhY2hlKSkpKQorICAgICAgICAgICAgICAgICgoY29uc3AgZGlyLW9yLWNhY2hlKQk7IHJl c3VsdCBmcm9tIGNhY2hlCisgICAgICAgICAgICAgICAgIDs7IElmIGNhY2hlIGVsZW1lbnQg aGFzIGFuIG10aW1lLCBhc3N1bWUgaXQgY2FtZQorICAgICAgICAgICAgICAgICA7OyBmcm9t IGEgZmlsZS4gIE90aGVyd2lzZSwgYXNzdW1lIGl0IHdhcyBzZXQKKyAgICAgICAgICAgICAg ICAgOzsgZGlyZWN0bHkuCisgICAgICAgICAgICAgICAgIChpZiAobnRoIDIgZGlyLW9yLWNh Y2hlKQorICAgICAgICAgICAgICAgICAgICAgKGNhciAobGFzdCAoZGlyLWxvY2Fscy0tYWxs LWZpbGVzIChjYXIgZGlyLW9yLWNhY2hlKSkpKQorICAgICAgICAgICAgICAgICAgIChjYWRy IGRpci1vci1jYWNoZSkpKQorICAgICAgICAgICAgICAgIDs7IFRyeSB0byBtYWtlIGEgcHJv cGVyIGZpbGUtbmFtZS4KKyAgICAgICAgICAgICAgICAodCAoZXhwYW5kLWZpbGUtbmFtZSAo aWYgKGVxIHN5c3RlbS10eXBlICdtcy1kb3MpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChkb3NpZmllZC1maWxlLW5hbWUgZGlyLWxvY2Fscy1maWxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyLWxvY2Fscy1maWxl KSkpKSkpKQorICAgICAgICAgIHZhcmlhYmxlcykKICAgICAgIDs7IEkgY2FuJ3QgYmUgYm90 aGVyZWQgdG8gaGFuZGxlIHRoaXMgY2FzZSByaWdodCBub3cuCiAgICAgICA7OyBEaXIgbG9j YWxzIHdlcmUgc2V0IGRpcmVjdGx5IGZyb20gYSBjbGFzcy4gIFlvdSBuZWVkIHRvCiAgICAg ICA7OyBkaXJlY3RseSBtb2RpZnkgdGhlIGNsYXNzIGluIGRpci1sb2NhbHMtY2xhc3MtYWxp c3QuCkBAIC01MjcsMzMgKzUzOCw3NSBAQCBkaXItbG9jYWxzLXRvLXN0cmluZwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjZHIgbW9kZS12YXJpYWJsZXMpICJc biIpKSkpCiAgICAgICAgICAgIHZhcmlhYmxlcyAiXG4iKSkpCiAKKyhkZWZ1biByZWFkLWRp ci1sb2NhbHMtZmlsZSAoKQorICAiUmVhZCBhIGRpci1sb2NhbHMgZmlsZW5hbWUgdXNpbmcg Y29tcGxldGlvbi4KK0ludGVuZGVkIHRvIGJlIHVzZWQgaW4gdGhlIGBpbnRlcmFjdGl2ZScg c3BlYyBvZiBgYWRkLWRpci1sb2NhbC12YXJpYWJsZScsCitgZGVsZXRlLWRpci1sb2NhbC12 YXJpYWJsZScgYW5kIGBjb3B5LWZpbGUtbG9jYWxzLXRvLWRpci1sb2NhbHMnLgorCitSZXR1 cm5zIHRoZSBmaWxlbmFtZSwgZXhwYW5kZWQuIgorICAobGV0KiAoKHByaSBkaXItbG9jYWxz LWZpbGUpCisgICAgICAgICAoc2VjIChyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcgIi5lbCQi ICItMi5lbCIgZGlyLWxvY2Fscy1maWxlKSkKKyAgICAgICAgIChkaXIgKG9yIChsb2NhdGUt ZG9taW5hdGluZy1maWxlIGRlZmF1bHQtZGlyZWN0b3J5IHByaSkKKyAgICAgICAgICAgICAg ICAgIChsb2NhdGUtZG9taW5hdGluZy1maWxlIGRlZmF1bHQtZGlyZWN0b3J5IHNlYykpKSkK KyAgICAoZXhwYW5kLWZpbGUtbmFtZQorICAgICAocmVhZC1maWxlLW5hbWUKKyAgICAgICJG aWxlOiAiCisgICAgICAoY29uZCAoZGlyKQorICAgICAgICAgICAgKCh3aGVuLWxldCAoKHBy b2ogKGFuZCAoZmVhdHVyZXAgJ3Byb2plY3QpIChwcm9qZWN0LWN1cnJlbnQpKSkpCisgICAg ICAgICAgICAgICAocHJvamVjdC1yb290IHByb2opKSkpCisgICAgICBuaWwKKyAgICAgIChs YW1iZGEgKGZuYW1lKQorICAgICAgICAobWVtYmVyIChmaWxlLW5hbWUtbm9uZGlyZWN0b3J5 IGZuYW1lKSAobGlzdCBwcmkgc2VjKSkpCisgICAgICBkaXItbG9jYWxzLWZpbGUpKSkpCisK IDs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gYWRkLWRpci1sb2NhbC12YXJpYWJsZSAobW9kZSB2 YXJpYWJsZSB2YWx1ZSkKLSAgIkFkZCBkaXJlY3RvcnktbG9jYWwgVkFSSUFCTEUgd2l0aCBp dHMgVkFMVUUgYW5kIE1PREUgdG8gLmRpci1sb2NhbHMuZWwuIgorKGRlZnVuIGFkZC1kaXIt bG9jYWwtdmFyaWFibGUgKG1vZGUgdmFyaWFibGUgdmFsdWUgJm9wdGlvbmFsIGZpbGUpCisg ICJBZGQgZGlyZWN0b3J5LWxvY2FsIFZBUklBQkxFIHdpdGggaXRzIFZBTFVFIGFuZCBNT0RF IHRvIC5kaXItbG9jYWxzLmVsLgorCitXaXRoIGEgcHJlZml4IGFyZ3VtZW50LCBwcm9tcHQg Zm9yIHRoZSBmaWxlIHRvIG1vZGlmeS4KKworV2hlbiBjYWxsZWQgZnJvbSBMaXNwLCBGSUxF IG1heSBiZSB0aGUgZXhwYW5kZWQgbmFtZSBvZiB0aGUgZGlyLWxvY2FscyBmaWxlCit3aGVy ZSB0byBhZGQgVkFSSUFCTEUuIgogICAoaW50ZXJhY3RpdmUKICAgIChsZXQgKHZhcmlhYmxl KQogICAgICAobGlzdAogICAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZS1tb2RlKQog ICAgICAgKHNldHEgdmFyaWFibGUgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZSAiQWRkIGRp cmVjdG9yeS1sb2NhbCB2YXJpYWJsZSIpKQotICAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJp YWJsZS12YWx1ZSB2YXJpYWJsZSkpKSkKLSAgKG1vZGlmeS1kaXItbG9jYWwtdmFyaWFibGUg bW9kZSB2YXJpYWJsZSB2YWx1ZSAnYWRkLW9yLXJlcGxhY2UpKQorICAgICAgKHJlYWQtZmls ZS1sb2NhbC12YXJpYWJsZS12YWx1ZSB2YXJpYWJsZSkKKyAgICAgICh3aGVuIGN1cnJlbnQt cHJlZml4LWFyZworICAgICAgICAocmVhZC1kaXItbG9jYWxzLWZpbGUpKSkpKQorICAobW9k aWZ5LWRpci1sb2NhbC12YXJpYWJsZSBtb2RlIHZhcmlhYmxlIHZhbHVlICdhZGQtb3ItcmVw bGFjZSBmaWxlKSkKIAogOzs7IyMjYXV0b2xvYWQKLShkZWZ1biBkZWxldGUtZGlyLWxvY2Fs LXZhcmlhYmxlIChtb2RlIHZhcmlhYmxlKQotICAiRGVsZXRlIGFsbCBNT0RFIHNldHRpbmdz IG9mIGZpbGUtbG9jYWwgVkFSSUFCTEUgZnJvbSAuZGlyLWxvY2Fscy5lbC4iCisoZGVmdW4g ZGVsZXRlLWRpci1sb2NhbC12YXJpYWJsZSAobW9kZSB2YXJpYWJsZSAmb3B0aW9uYWwgZmls ZSkKKyAgIkRlbGV0ZSBhbGwgTU9ERSBzZXR0aW5ncyBvZiBkaXItbG9jYWwgVkFSSUFCTEUg ZnJvbSAuZGlyLWxvY2Fscy5lbC4KKworV2l0aCBhIHByZWZpeCBhcmd1bWVudCwgcHJvbXB0 IGZvciB0aGUgZmlsZSB0byBtb2RpZnkuCisKK1doZW4gY2FsbGVkIGZyb20gTGlzcCwgRklM RSBtYXkgYmUgdGhlIGV4cGFuZGVkIG5hbWUgb2YgdGhlIGRpci1sb2NhbHMgZmlsZQorZnJv bSB3aGVyZSB0byBkZWxldGUgVkFSSUFCTEUuIgogICAoaW50ZXJhY3RpdmUKICAgIChsaXN0 CiAgICAgKHJlYWQtZmlsZS1sb2NhbC12YXJpYWJsZS1tb2RlKQotICAgIChyZWFkLWZpbGUt bG9jYWwtdmFyaWFibGUgIkRlbGV0ZSBkaXJlY3RvcnktbG9jYWwgdmFyaWFibGUiKSkpCi0g IChtb2RpZnktZGlyLWxvY2FsLXZhcmlhYmxlIG1vZGUgdmFyaWFibGUgbmlsICdkZWxldGUp KQorICAgIChyZWFkLWZpbGUtbG9jYWwtdmFyaWFibGUgIkRlbGV0ZSBkaXJlY3RvcnktbG9j YWwgdmFyaWFibGUiKQorICAgICh3aGVuIGN1cnJlbnQtcHJlZml4LWFyZworICAgICAgKHJl YWQtZGlyLWxvY2Fscy1maWxlKSkpKQorICAobW9kaWZ5LWRpci1sb2NhbC12YXJpYWJsZSBt b2RlIHZhcmlhYmxlIG5pbCAnZGVsZXRlIGZpbGUpKQogCiA7OzsjIyNhdXRvbG9hZAotKGRl ZnVuIGNvcHktZmlsZS1sb2NhbHMtdG8tZGlyLWxvY2FscyAoKQotICAiQ29weSBmaWxlLWxv Y2FsIHZhcmlhYmxlcyB0byAuZGlyLWxvY2Fscy5lbC4iCi0gIChpbnRlcmFjdGl2ZSkKKyhk ZWZ1biBjb3B5LWZpbGUtbG9jYWxzLXRvLWRpci1sb2NhbHMgKCZvcHRpb25hbCBmaWxlKQor ICAiQ29weSBmaWxlLWxvY2FsIHZhcmlhYmxlcyB0byAuZGlyLWxvY2Fscy5lbC4KKworV2l0 aCBhIHByZWZpeCBhcmd1bWVudCwgcHJvbXB0IGZvciB0aGUgZmlsZSB0byBtb2RpZnkuCisK K1doZW4gY2FsbGVkIGZyb20gTGlzcCwgRklMRSBtYXkgYmUgdGhlIGV4cGFuZGVkIG5hbWUg b2YgdGhlIGRpci1sb2NhbHMgZmlsZQord2hlcmUgdG8gY29weSB0aGUgZmlsZS1sb2NhbCB2 YXJpYWJsZXMuIgorICAoaW50ZXJhY3RpdmUKKyAgIChsaXN0ICh3aGVuIGN1cnJlbnQtcHJl Zml4LWFyZworICAgICAgICAgICAocmVhZC1kaXItbG9jYWxzLWZpbGUpKSkpCiAgIChkb2xp c3QgKGVsdCBmaWxlLWxvY2FsLXZhcmlhYmxlcy1hbGlzdCkKICAgICAodW5sZXNzIChhc3Nx IChjYXIgZWx0KSBkaXItbG9jYWwtdmFyaWFibGVzLWFsaXN0KQotICAgICAgKGFkZC1kaXIt bG9jYWwtdmFyaWFibGUgbWFqb3ItbW9kZSAoY2FyIGVsdCkgKGNkciBlbHQpKSkpKQorICAg ICAgKGFkZC1kaXItbG9jYWwtdmFyaWFibGUgbWFqb3ItbW9kZSAoY2FyIGVsdCkgKGNkciBl bHQpIGZpbGUpKSkpCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gY29weS1kaXItbG9jYWxz LXRvLWZpbGUtbG9jYWxzICgpCi0tIAoyLjM0LjEKCg== --------------4cCsFCOpWGQc5mFRdJvqeu93-- From unknown Tue Jun 17 22:10:58 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66663: 30.0.50; Allow dir locals file selection in *-dir-local-variable functions Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Oct 2023 17:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Mauro Aranda Cc: Eli Zaretskii , 66663@debbugs.gnu.org Received: via spool by 66663-submit@debbugs.gnu.org id=B66663.169799741914061 (code B ref 66663); Sun, 22 Oct 2023 17:57:01 +0000 Received: (at 66663) by debbugs.gnu.org; 22 Oct 2023 17:56:59 +0000 Received: from localhost ([127.0.0.1]:48048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quch9-0003ei-2c for submit@debbugs.gnu.org; Sun, 22 Oct 2023 13:56:59 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]:41583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quch5-0003eQ-Nw; Sun, 22 Oct 2023 13:56:57 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 36DA5E0002; Sun, 22 Oct 2023 17:56:19 +0000 (UTC) From: Juri Linkov In-Reply-To: <8b4f9985-6bde-40e8-bd89-e74084e823a5@gmail.com> (Mauro Aranda's message of "Sat, 21 Oct 2023 19:10:10 -0300") Organization: LINKOV.NET References: <03e5c99d-f900-4c8f-88b3-e7b458c0c777@gmail.com> <83o7gsqh3i.fsf@gnu.org> <514ef416-843b-4b80-abcf-cb4621b4b58d@gmail.com> <86zg0bu99e.fsf@mail.linkov.net> <8b4f9985-6bde-40e8-bd89-e74084e823a5@gmail.com> Date: Sun, 22 Oct 2023 20:55:14 +0300 Message-ID: <86pm16tud9.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-GND-Sasl: juri@linkov.net X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 66663 30.0.50 thanks >> This needs to be run in the project's root directory >> where the dir-locals file is saved.  Probably it's not easy >> to find the root without using project.el.  But when one of the >> files already exists (either .dir-locals.el or .dir-locals-2.el), >> then better to use the directory of the existing file by default. > > In this new patch, I went for using it if already available and we > couldn't find an existing file by other means. Thanks, I've tested your patch, and it works nicely, so now pushed to master.