diff options
author | Eli Zaretskii <eliz@gnu.org> | 2023-01-20 10:28:26 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-20 10:28:26 +0200 |
commit | 6b2f85caa6cae1178b8abee531b0b9b0cf618a00 (patch) | |
tree | 9a7768513e40f700cf7c9f587ad117f058f6b56e /lisp/progmodes/dockerfile-ts-mode.el | |
parent | b56cf28b325c927d5e51173b00f5e5354ba62def (diff) | |
download | emacs-6b2f85caa6cae1178b8abee531b0b9b0cf618a00.tar.gz emacs-6b2f85caa6cae1178b8abee531b0b9b0cf618a00.tar.bz2 emacs-6b2f85caa6cae1178b8abee531b0b9b0cf618a00.zip |
Make tree-sitter based modes optional
* lisp/progmodes/c-ts-mode.el: Update Commentary. Make
'auto-mode-alist' update conditional on the tree-sitter and
grammar libraries being available.
* lisp/progmodes/cmake-ts-mode.el:
* lisp/progmodes/csharp-mode.el:
* lisp/progmodes/dockerfile-ts-mode.el:
* lisp/progmodes/go-ts-mode.el:
* lisp/progmodes/java-ts-mode.el:
* lisp/progmodes/js.el:
* lisp/progmodes/json-ts-mode.el:
* lisp/progmodes/python.el:
* lisp/progmodes/ruby-ts-mode.el:
* lisp/progmodes/typescript-ts-mode.el:
* lisp/textmodes/css-mode.el:
* lisp/textmodes/toml-ts-mode.el:
* lisp/textmodes/yaml-ts-mode.el: Make 'auto-mode-alist' update
for tree-sitter based modes be conditional on the tree-sitter and
grammar libraries being available. (Bug#60559)
Diffstat (limited to 'lisp/progmodes/dockerfile-ts-mode.el')
-rw-r--r-- | lisp/progmodes/dockerfile-ts-mode.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/dockerfile-ts-mode.el b/lisp/progmodes/dockerfile-ts-mode.el index 3f8766e6713..2a295e885b0 100644 --- a/lisp/progmodes/dockerfile-ts-mode.el +++ b/lisp/progmodes/dockerfile-ts-mode.el @@ -133,12 +133,6 @@ the subtrees." `((,name . ,marker)))))) ;;;###autoload -(add-to-list 'auto-mode-alist - ;; NOTE: We can't use `rx' here, as it breaks bootstrap. - '("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'" - . dockerfile-ts-mode)) - -;;;###autoload (define-derived-mode dockerfile-ts-mode prog-mode "Dockerfile" "Major mode for editing Dockerfiles, powered by tree-sitter." :group 'dockerfile @@ -172,6 +166,12 @@ the subtrees." (treesit-major-mode-setup))) +(if (treesit-ready-p 'dockerfile) + (add-to-list 'auto-mode-alist + ;; NOTE: We can't use `rx' here, as it breaks bootstrap. + '("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'" + . dockerfile-ts-mode))) + (provide 'dockerfile-ts-mode) ;;; dockerfile-ts-mode.el ends here |