From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Brian Leung Newsgroups: gmane.emacs.bugs Subject: bug#67795: [PATCH] Handle local-variable major-mode remaps specifying non-existent mode Date: Tue, 12 Dec 2023 13:52:53 +0000 Message-ID: <87r0jrplx1.fsf@posteo.net> 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="10275"; mail-complaints-to="usenet@ciao.gmane.io" To: 67795@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 12 14:54:11 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 1rD3D8-0002T9-4u for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 12 Dec 2023 14:54:10 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rD3Cr-0006Ua-6I; Tue, 12 Dec 2023 08:53:53 -0500 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 1rD3Cl-0006UK-P6 for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2023 08:53:49 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rD3Cl-00087G-Gu for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2023 08:53:47 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rD3D0-0005Sv-Lc for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2023 08:54:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Dec 2023 13:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67795 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170238922820985 (code B ref -1); Tue, 12 Dec 2023 13:54:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Dec 2023 13:53:48 +0000 Original-Received: from localhost ([127.0.0.1]:55580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rD3Cl-0005SP-L8 for submit@debbugs.gnu.org; Tue, 12 Dec 2023 08:53:48 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:37118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rD3Ck-0005SB-Aq for submit@debbugs.gnu.org; Tue, 12 Dec 2023 08:53:46 -0500 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 1rD3CP-0006TQ-LE for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2023 08:53:25 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rD3CN-0007x7-Ld for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2023 08:53:25 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6943D240101 for ; Tue, 12 Dec 2023 14:53:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1702389198; bh=AvfXDnYl0YAaFnvFAmRvC8VqpCMFjQEg2xtNp3w1qHU=; h=From:To:Subject:Date:Message-ID:MIME-Version:From; b=Kn5VsYgehWrX7rDcCf4bSh4wUYsDVBsxXJfcssyKbGLhBpJfklem3CgiH28iSE0RU 0oSIsvu1Tf6LHhdLP2vZyqj8whIdstbowSHljEkPNJJ146S0iGEek5djEH5fMbzu73 Hf5maFkrMiOYijFT2/topWr5gKoNWKuHniPQ3keThH6M4Rul/7fIYJJKZsJVaGX3uo DT1l8RS0QxyKhHAPBgRJ+RqP9hPjZXLnpgMXK8r8ncnQAs2mJrhXfZXABbAhvJG8yB Enp4qzgmIYkHYUEULKMA4yJ/FMJ5DZBFpf7VCg7++1T+FnMvbt4w/QyMZsK5P61gom t2izfUZ8yDJNA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SqKnn49XYz6twM for ; Tue, 12 Dec 2023 14:53:17 +0100 (CET) Received-SPF: pass client-ip=185.67.36.66; envelope-from=leungbk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:276042 Archived-At: --=-=-= Content-Type: text/plain; format=flowed Tags: patch In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.18.0, Xaw3d scroll bars) Repository revision: 9434ad25ce2747864e0bcf5665f65eb65a079178 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101009 System Description: NixOS 24.05 (Uakari) Configured using: 'configure --prefix=/nix/store/q131p42vldq964fr9rpdz1qmsqrywa00-emacs-git-20231211.0 --disable-build-details --with-modules --with-x-toolkit=lucid --with-xft --with-cairo --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Handle-local-variable-major-mode-remaps-specifying-n.patch >From 46435cac589506ecb131f480171a2ec1f0f03c55 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 12 Dec 2023 05:42:56 -0800 Subject: [PATCH] Handle local-variable major-mode remaps specifying non-existent mode In the .clang-format file of current Emacs HEAD, the major mode is specified as yaml-mode via a local variable. However, a user who has loaded yaml-ts-mode and executed (add-to-list 'major-mode-remap-alist '(yaml-mode . yaml-ts-mode) but does not have yaml-mode defined will find that opening the .clang-format file does not use yaml-ts-mode. This patch fixes that. * lisp/files.el (set-auto-mode): Check for any remapping specified in major-mode-remap-alist. (hack-local-variables--find-variables): Same. --- lisp/files.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index f87e7807301..8e92da6d49d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3445,7 +3445,7 @@ set-auto-mode (and (not done) (setq mode (hack-local-variables t (not try-locals))) (not (memq mode modes)) ; already tried and failed - (if (not (functionp mode)) + (if (not (functionp (alist-get mode major-mode-remap-alist mode))) (message "Ignoring unknown mode `%s'" mode) (setq done t) (set-auto-mode-0 mode keep-mode-if-same))) @@ -4182,7 +4182,9 @@ hack-local-variables--find-variables (forward-line 1))))))) (if (eq handle-mode t) ;; Return the final mode: setting that's defined. - (car (seq-filter #'fboundp result)) + (seq-find (lambda (mode) + (fboundp (alist-get mode major-mode-remap-alist mode))) + result) result))) (defun hack-local-variables-apply () -- 2.42.0 --=-=-=--