diff options
| author | Eli Zaretskii | 2025-03-29 13:22:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2025-03-29 13:22:11 +0300 |
| commit | cedefabfcfbe283fd539d8d290db550069807126 (patch) | |
| tree | 36d138dd41bdca6255da70478c60bdf807a7c142 | |
| parent | 891f51fe118597ffe58d5d817fff693db3188639 (diff) | |
| download | emacs-cedefabfcfbe283fd539d8d290db550069807126.tar.gz emacs-cedefabfcfbe283fd539d8d290db550069807126.zip | |
; Fix last change
* lisp/files.el (auto-mode-alist):
* etc/NEWS: Fix last change. (Bug#77138)
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
2 files changed, 3 insertions, 2 deletions
| @@ -1638,7 +1638,7 @@ highlight the fill-column indicators. By default this is disabled. | |||
| 1638 | * New Modes and Packages in Emacs 31.1 | 1638 | * New Modes and Packages in Emacs 31.1 |
| 1639 | 1639 | ||
| 1640 | ** New major mode 'conf-npmrc-mode'. | 1640 | ** New major mode 'conf-npmrc-mode'. |
| 1641 | A major mode based on conf-mode purposed for editing ".npmrc" files. | 1641 | A major mode based on 'conf-mode' for editing ".npmrc" files. |
| 1642 | 1642 | ||
| 1643 | ** New major modes based on the tree-sitter library | 1643 | ** New major modes based on the tree-sitter library |
| 1644 | 1644 | ||
diff --git a/lisp/files.el b/lisp/files.el index 9c98adf84c2..3ce5d6264dc 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -3207,7 +3207,8 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\|SQUASHFS\\)\\'" . | |||
| 3207 | ("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode) | 3207 | ("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode) |
| 3208 | ("\\.toml\\'" . conf-toml-mode) | 3208 | ("\\.toml\\'" . conf-toml-mode) |
| 3209 | ("\\.desktop\\'" . conf-desktop-mode) | 3209 | ("\\.desktop\\'" . conf-desktop-mode) |
| 3210 | ;; Dot is excluded from npmrc, because global configs may lack it. | 3210 | ;; Dot is excluded from npmrc, because global configs may lack it, |
| 3211 | ;; e.g. in /etc/npmrc files. | ||
| 3211 | ("npmrc\\'" . conf-npmrc-mode) | 3212 | ("npmrc\\'" . conf-npmrc-mode) |
| 3212 | ("/\\.redshift\\.conf\\'" . conf-windows-mode) | 3213 | ("/\\.redshift\\.conf\\'" . conf-windows-mode) |
| 3213 | ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode) | 3214 | ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode) |