Skip to content

Fix flycheck errors #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 13, 2024
Merged

Fix flycheck errors #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d9641
Update emacs dependency to 29.1
p4v4n Feb 13, 2024
45deef9
Rename derived mode vars to match package prefix
p4v4n Feb 13, 2024
68f42da
Update Changelog
p4v4n Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
18 changes: 9 additions & 9 deletions clojure-ts-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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}")
Expand Down