Merge branch 'main' into setup-eldev

Author: p4v4n

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)
 

README.md

@@ -22,7 +22,7 @@ Most configuration changes will require reverting any active `clojure-ts-mode` b
 
 `clojure-ts-mode` currently supports 2 different indentation strategies:
 
-- `semantic`, the default, which tries to match the indentation of `clojure-mode` and cljfmt
+- `semantic`, the default, which tries to match the indentation of `clojure-mode` and `cljfmt`
 - `fixed`, [a simple indentation strategy outlined by Tonsky in a blog post](https://tonsky.me/blog/clojurefmt/)
 
 Set the var `clojure-ts-indent-style` to change it.
@@ -46,7 +46,7 @@ highlighted like regular clojure code.
 
 ### Navigation and Evaluation
 
-To make forms inside of `(comment ...)` forms appear as toplevel forms for evaluation and navigation, set
+To make forms inside of `(comment ...)` forms appear as top-level forms for evaluation and navigation, set
 
 ``` emacs-lisp
 (setq clojure-ts-toplevel-inside-comment-form t)
@@ -186,7 +186,7 @@ under your `user-emacs-directory` (typically `~/.emacs.d` on Unix systems).
 
 Not yet out of the box, but that [should change soon](https://github.com/clojure-emacs/cider/pull/3461). Feel free to help out with the remaining work, so we can expedite the process.
 
-For now, when you take care of the keybindings for the cider functions you use and ensure `cider-mode` is enabled for `clojure-ts-mode` buffers in your config, most functinality should already work:
+For now, when you take care of the keybindings for the cider functions you use and ensure `cider-mode` is enabled for `clojure-ts-mode` buffers in your config, most functionality should already work:
 
 ```emacs-lisp
 (add-hook 'clojure-ts-mode-hook #'cider-mode)

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.
 
@@ -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}")