From 47d9641c5ed079dd03e99716a63d0f44dc83207c Mon Sep 17 00:00:00 2001 From: p4v4n Date: Tue, 13 Feb 2024 06:57:45 +0530 Subject: [PATCH 1/3] Update emacs dependency to 29.1 --- clojure-ts-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el index 65328e7..2372b0e 100644 --- a/clojure-ts-mode.el +++ b/clojure-ts-mode.el @@ -7,7 +7,7 @@ ;; URL: http://github.com/clojure-emacs/clojure-ts-mode ;; Keywords: languages clojure clojurescript lisp ;; Version: 0.2.0 -;; Package-Requires: ((emacs "29")) +;; Package-Requires: ((emacs "29.1")) ;; This file is not part of GNU Emacs. From 45deef96eec7f68cae62acad9523840a781cc00d Mon Sep 17 00:00:00 2001 From: p4v4n Date: Tue, 13 Feb 2024 06:59:59 +0530 Subject: [PATCH 2/3] Rename derived mode vars to match package prefix - clojurescript-ts-mode -> clojure-ts-clojurescript-mode - clojurec-ts-mode -> clojure-ts-clojurec-mode - clojure-dart-ts-mode -> clojure-ts-clojuredart-mode - clojure-jank-ts-mode -> clojure-ts-jank-mode --- clojure-ts-mode.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el index 2372b0e..481a82b 100644 --- a/clojure-ts-mode.el +++ b/clojure-ts-mode.el @@ -861,22 +861,22 @@ forms like deftype, defrecord, reify, proxy, etc." ;(set-keymap-parent map clojure-mode-map) map)) -(defvar clojurescript-ts-mode-map +(defvar clojure-ts-clojurescript-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map clojure-ts-mode-map) map)) -(defvar clojurec-ts-mode-map +(defvar clojure-ts-clojurec-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map clojure-ts-mode-map) map)) -(defvar clojure-dart-ts-mode-map +(defvar clojure-ts-clojuredart-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map clojure-ts-mode-map) map)) -(defvar clojure-jank-ts-mode-map +(defvar clojure-ts-jank-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map clojure-ts-mode-map) map)) @@ -965,25 +965,25 @@ See `clojure-ts--font-lock-settings' for usage of MARKDOWN-AVAILABLE." (setq-local transpose-sexps-function #'transpose-sexps-default-function))))) ;;;###autoload -(define-derived-mode clojurescript-ts-mode clojure-ts-mode "ClojureScript[TS]" +(define-derived-mode clojure-ts-clojurescript-mode clojure-ts-mode "ClojureScript[TS]" "Major mode for editing ClojureScript code. \\{clojurescript-ts-mode-map}") ;;;###autoload -(define-derived-mode clojurec-ts-mode clojure-ts-mode "ClojureC[TS]" +(define-derived-mode clojure-ts-clojurec-mode clojure-ts-mode "ClojureC[TS]" "Major mode for editing ClojureC code. \\{clojurec-ts-mode-map}") ;;;###autoload -(define-derived-mode clojure-dart-ts-mode clojure-ts-mode "ClojureDart[TS]" +(define-derived-mode clojure-ts-clojuredart-mode clojure-ts-mode "ClojureDart[TS]" "Major mode for editing Clojure Dart code. \\{clojure-dart-ts-mode-map}") ;;;###autoload -(define-derived-mode clojure-jank-ts-mode clojure-ts-mode "Jank[TS]" +(define-derived-mode clojure-ts-jank-mode clojure-ts-mode "Jank[TS]" "Major mode for editing Jank code. \\{clojure-jank-ts-mode-map}") From 68f42dad482b6c00ab688603a60091f67ca9060a Mon Sep 17 00:00:00 2001 From: p4v4n Date: Tue, 13 Feb 2024 17:23:37 +0530 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e654cf..4983bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Changelog ## main (unreleased) - +- Rename all derived mode vars to match the package prefix. ([#36](https://github.com/clojure-emacs/clojure-ts-mode/pull/36)) +`clojurescript-ts-mode` -> `clojure-ts-clojurescript-mode` +`clojurec-ts-mode` -> `clojure-ts-clojurec-mode` +`clojure-dart-ts-mode` -> `clojure-ts-clojuredart-mode` +`clojure-jank-ts-mode` -> `clojure-ts-jank-mode` - Add custom option `clojure-ts-toplevel-inside-comment-form` as an equivalent to `clojure-toplevel-inside-comment-form` in clojure-mode (#30) - Change behavior of `beginning-of-defun` and `end-of-defun` to consider all Clojure sexps as defuns (#32)