From d4f0c957d29f60fd903b86470f83d2edda405041 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 24 Dec 2025 14:44:49 +0100 Subject: [PATCH] update clojure --- .../clojure-mode-autoloads.el | 21 +++++++++++ .../clojure-mode-pkg.el | 6 +-- .../clojure-mode.el | 37 ++++++++++++------- 3 files changed, 48 insertions(+), 16 deletions(-) rename elpa/{clojure-mode-20241211.1522 => clojure-mode-20250527.840}/clojure-mode-autoloads.el (89%) rename elpa/{clojure-mode-20241211.1522 => clojure-mode-20250527.840}/clojure-mode-pkg.el (69%) rename elpa/{clojure-mode-20241211.1522 => clojure-mode-20250527.840}/clojure-mode.el (99%) diff --git a/elpa/clojure-mode-20241211.1522/clojure-mode-autoloads.el b/elpa/clojure-mode-20250527.840/clojure-mode-autoloads.el similarity index 89% rename from elpa/clojure-mode-20241211.1522/clojure-mode-autoloads.el rename to elpa/clojure-mode-20250527.840/clojure-mode-autoloads.el index 8cf316e9..cadd9a14 100644 --- a/elpa/clojure-mode-20241211.1522/clojure-mode-autoloads.el +++ b/elpa/clojure-mode-20250527.840/clojure-mode-autoloads.el @@ -94,10 +94,31 @@ Major mode for editing ClojureC code. \\{clojurec-mode-map} +(fn)" t) +(autoload 'clojuredart-mode "clojure-mode" "\ +Major mode for editing Clojure Dart code. + +\\{clojuredart-mode-map} + +(fn)" t) +(autoload 'jank-mode "clojure-mode" "\ +Major mode for editing Jank code. + +\\{jank-mode-map} + +(fn)" t) +(autoload 'joker-mode "clojure-mode" "\ +Major mode for editing Joker code. + +\\{joker-mode-map} + (fn)" t) (add-to-list 'auto-mode-alist '("\\.\\(clj\\|cljd\\|dtm\\|edn\\|lpy\\)\\'" . clojure-mode)) (add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojurec-mode)) (add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojurescript-mode)) +(add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojuredart-mode)) +(add-to-list 'auto-mode-alist '("\\.jank\\'" . jank-mode)) +(add-to-list 'auto-mode-alist '("\\.joke\\'" . joker-mode)) (add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode)) (add-to-list 'interpreter-mode-alist '("bb" . clojure-mode)) (add-to-list 'interpreter-mode-alist '("nbb" . clojurescript-mode)) diff --git a/elpa/clojure-mode-20241211.1522/clojure-mode-pkg.el b/elpa/clojure-mode-20250527.840/clojure-mode-pkg.el similarity index 69% rename from elpa/clojure-mode-20241211.1522/clojure-mode-pkg.el rename to elpa/clojure-mode-20250527.840/clojure-mode-pkg.el index 18f620e0..c3d793be 100644 --- a/elpa/clojure-mode-20241211.1522/clojure-mode-pkg.el +++ b/elpa/clojure-mode-20250527.840/clojure-mode-pkg.el @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "clojure-mode" "20241211.1522" +(define-package "clojure-mode" "20250527.840" "Major mode for Clojure code." '((emacs "25.1")) :url "https://github.com/clojure-emacs/clojure-mode" - :commit "76630045fb5b1660c91e2ab960f5636f4d567c47" - :revdesc "76630045fb5b" + :commit "d336db623e7ae8cffff50aaaea3f1b05cc4ccecb" + :revdesc "d336db623e7a" :keywords '("languages" "clojure" "clojurescript" "lisp") :maintainers '(("Bozhidar Batsov" . "bozhidar@batsov.dev"))) diff --git a/elpa/clojure-mode-20241211.1522/clojure-mode.el b/elpa/clojure-mode-20250527.840/clojure-mode.el similarity index 99% rename from elpa/clojure-mode-20241211.1522/clojure-mode.el rename to elpa/clojure-mode-20250527.840/clojure-mode.el index 5392004b..f6d3f071 100644 --- a/elpa/clojure-mode-20241211.1522/clojure-mode.el +++ b/elpa/clojure-mode-20250527.840/clojure-mode.el @@ -1,7 +1,7 @@ ;;; clojure-mode.el --- Major mode for Clojure code -*- lexical-binding: t; -*- ;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg -;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba, Magnar Sveen +;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba, Magnar Sveen ;; ;; Authors: Jeffrey Chu ;; Lennart Staflin @@ -12,8 +12,8 @@ ;; Maintainer: Bozhidar Batsov ;; URL: https://github.com/clojure-emacs/clojure-mode ;; Keywords: languages clojure clojurescript lisp -;; Package-Version: 20241211.1522 -;; Package-Revision: 76630045fb5b +;; Package-Version: 20250527.840 +;; Package-Revision: d336db623e7a ;; Package-Requires: ((emacs "25.1")) ;; This file is not part of GNU Emacs. @@ -543,16 +543,6 @@ ENDP and DELIM." "\\_<\\(?:'+\\|#\\)") (line-beginning-position))))) -(defconst clojure--collection-tag-regexp "#\\(::[a-zA-Z0-9._-]*\\|:?\\([a-zA-Z0-9._-]+/\\)?[a-zA-Z0-9._-]+\\)" - "Collection reader macro tag regexp. -It is intended to check for allowed strings that can come before a -collection literal (e.g. '[]' or '{}'), as reader macro tags. -This includes #fully.qualified/my-ns[:kw val] and #::my-ns{:kw -val} as of Clojure 1.9.") - -(make-obsolete-variable 'clojure--collection-tag-regexp nil "5.12.0") -(make-obsolete 'clojure-no-space-after-tag 'clojure-space-for-delimiter-p "5.12.0") - (declare-function paredit-open-curly "ext:paredit" t t) (declare-function paredit-close-curly "ext:paredit" t t) (declare-function paredit-convolute-sexp "ext:paredit") @@ -3321,12 +3311,33 @@ With universal argument \\[universal-argument], act on the \"top-level\" form." \\{clojurec-mode-map}") +;;;###autoload +(define-derived-mode clojuredart-mode clojure-mode "ClojureDart" + "Major mode for editing Clojure Dart code. + +\\{clojuredart-mode-map}") + +;;;###autoload +(define-derived-mode jank-mode clojure-mode "Jank" + "Major mode for editing Jank code. + +\\{jank-mode-map}") + +;;;###autoload +(define-derived-mode joker-mode clojure-mode "Joker" + "Major mode for editing Joker code. + +\\{joker-mode-map}") + ;;;###autoload (progn (add-to-list 'auto-mode-alist '("\\.\\(clj\\|cljd\\|dtm\\|edn\\|lpy\\)\\'" . clojure-mode)) (add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojurec-mode)) (add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojurescript-mode)) + (add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojuredart-mode)) + (add-to-list 'auto-mode-alist '("\\.jank\\'" . jank-mode)) + (add-to-list 'auto-mode-alist '("\\.joke\\'" . joker-mode)) ;; boot build scripts are Clojure source files (add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode)) ;; babashka scripts are Clojure source files -- 2.47.3