From 0c1015ad60602978fdf60b8e72df95bc53692ca5 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Fri, 31 Jan 2020 17:45:21 +0100 Subject: [PATCH] update clojure-mode and clomacs --- .../clojure-mode-20190914.1029/clojure-mode-pkg.el | 2 -- .../clojure-mode-autoloads.el | 11 ++++++++--- .../clojure-mode-20191112.1948/clojure-mode-pkg.el | 2 ++ .../clojure-mode.el | 14 ++++++++++---- elpa/clomacs-20190925.1509/clomacs-pkg.el | 2 -- .../clomacs-autoloads.el | 10 ++++++++-- elpa/clomacs-20191201.200/clomacs-pkg.el | 2 ++ .../clomacs.el | 5 +++-- elpa/clomacs-readme.txt | 7 +++++++ 9 files changed, 40 insertions(+), 15 deletions(-) delete mode 100644 elpa/clojure-mode-20190914.1029/clojure-mode-pkg.el rename elpa/{clojure-mode-20190914.1029 => clojure-mode-20191112.1948}/clojure-mode-autoloads.el (91%) create mode 100644 elpa/clojure-mode-20191112.1948/clojure-mode-pkg.el rename elpa/{clojure-mode-20190914.1029 => clojure-mode-20191112.1948}/clojure-mode.el (99%) delete mode 100644 elpa/clomacs-20190925.1509/clomacs-pkg.el rename elpa/{clomacs-20190925.1509 => clomacs-20191201.200}/clomacs-autoloads.el (87%) create mode 100644 elpa/clomacs-20191201.200/clomacs-pkg.el rename elpa/{clomacs-20190925.1509 => clomacs-20191201.200}/clomacs.el (99%) create mode 100644 elpa/clomacs-readme.txt diff --git a/elpa/clojure-mode-20190914.1029/clojure-mode-pkg.el b/elpa/clojure-mode-20190914.1029/clojure-mode-pkg.el deleted file mode 100644 index b12e59aa..00000000 --- a/elpa/clojure-mode-20190914.1029/clojure-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "clojure-mode" "20190914.1029" "Major mode for Clojure code" '((emacs "25.1")) :commit "147bf84189ef672161b2229ddc5c35713323ad59" :keywords '("languages" "clojure" "clojurescript" "lisp") :url "http://github.com/clojure-emacs/clojure-mode") diff --git a/elpa/clojure-mode-20190914.1029/clojure-mode-autoloads.el b/elpa/clojure-mode-20191112.1948/clojure-mode-autoloads.el similarity index 91% rename from elpa/clojure-mode-20190914.1029/clojure-mode-autoloads.el rename to elpa/clojure-mode-20191112.1948/clojure-mode-autoloads.el index c24a5fa6..ce71f3e6 100644 --- a/elpa/clojure-mode-20190914.1029/clojure-mode-autoloads.el +++ b/elpa/clojure-mode-20191112.1948/clojure-mode-autoloads.el @@ -1,10 +1,12 @@ ;;; clojure-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + -;;;### (autoloads nil "clojure-mode" "clojure-mode.el" (23994 46782 -;;;;;; 961084 674000)) +;;;### (autoloads nil "clojure-mode" "clojure-mode.el" (0 0 0 0)) ;;; Generated autoloads from clojure-mode.el (autoload 'clojure-mode "clojure-mode" "\ @@ -146,11 +148,14 @@ Major mode for editing ClojureC code. (add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode)) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "clojure-mode" '("clojure" "add-custom-clojure-indents" "define-clojure-indent" "put-clojure-indent"))) + ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t +;; coding: utf-8 ;; End: ;;; clojure-mode-autoloads.el ends here diff --git a/elpa/clojure-mode-20191112.1948/clojure-mode-pkg.el b/elpa/clojure-mode-20191112.1948/clojure-mode-pkg.el new file mode 100644 index 00000000..a37e1762 --- /dev/null +++ b/elpa/clojure-mode-20191112.1948/clojure-mode-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "clojure-mode" "20191112.1948" "Major mode for Clojure code" '((emacs "25.1")) :commit "51016faaa88956bdd4decf2fa94dd5198777a47c" :keywords '("languages" "clojure" "clojurescript" "lisp") :url "http://github.com/clojure-emacs/clojure-mode") diff --git a/elpa/clojure-mode-20190914.1029/clojure-mode.el b/elpa/clojure-mode-20191112.1948/clojure-mode.el similarity index 99% rename from elpa/clojure-mode-20190914.1029/clojure-mode.el rename to elpa/clojure-mode-20191112.1948/clojure-mode.el index 7f1065f1..e508d43f 100644 --- a/elpa/clojure-mode-20190914.1029/clojure-mode.el +++ b/elpa/clojure-mode-20191112.1948/clojure-mode.el @@ -9,7 +9,7 @@ ;; Bozhidar Batsov ;; Artur Malabarba ;; URL: http://github.com/clojure-emacs/clojure-mode -;; Package-Version: 20190914.1029 +;; Package-Version: 20191112.1948 ;; Keywords: languages clojure clojurescript lisp ;; Version: 5.11.0 ;; Package-Requires: ((emacs "25.1")) @@ -655,14 +655,16 @@ If JUSTIFY is non-nil, justify as well as fill the paragraph." ;; Code heavily borrowed from Slime. ;; https://github.com/slime/slime/blob/master/contrib/slime-fontifying-fu.el#L186 (defvar clojure--comment-macro-regexp - (rx "#_" (* " ") (group-n 1 (not (any " ")))) + (rx (seq (+ (seq "#_" (* " ")))) (group-n 1 (not (any " ")))) "Regexp matching the start of a comment sexp. The beginning of match-group 1 should be before the sexp to be marked as a comment. The end of sexp is found with `clojure-forward-logical-sexp'.") (defvar clojure--reader-and-comment-regexp - "#_ *\\(?1:[^ ]\\)\\|\\(?1:(comment\\_>\\)" + (rx (or (seq (+ (seq "#_" (* " "))) + (group-n 1 (not (any " ")))) + (seq (group-n 1 "(comment" symbol-end)))) "Regexp matching both `#_' macro and a comment sexp." ) (defcustom clojure-comment-regexp clojure--comment-macro-regexp @@ -688,7 +690,11 @@ what is considered a comment (affecting font locking). (nth 4 state)) (clojure--search-comment-macro-internal limit) (goto-char start) - (clojure-forward-logical-sexp 1) + ;; Count how many #_ we got and step by that many sexps + ;; For (comment ...), step at least 1 sexp + (clojure-forward-logical-sexp + (max (count-matches (rx "#_") (elt md 0) (elt md 1)) + 1)) ;; Data for (match-end 1). (setf (elt md 3) (point)) (set-match-data md) diff --git a/elpa/clomacs-20190925.1509/clomacs-pkg.el b/elpa/clomacs-20190925.1509/clomacs-pkg.el deleted file mode 100644 index d3279381..00000000 --- a/elpa/clomacs-20190925.1509/clomacs-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "clomacs" "20190925.1509" "Simplifies Emacs Lisp interaction with Clojure." '((emacs "24.3") (cider "0.22.1") (s "1.12.0") (simple-httpd "1.4.6")) :commit "292c8f5370a2c74094da46ede990b5e7cc8b55b8" :keywords '("clojure" "interaction") :authors '(("Kostafey" . "kostafey@gmail.com")) :maintainer '("Kostafey" . "kostafey@gmail.com") :url "https://github.com/clojure-emacs/clomacs") diff --git a/elpa/clomacs-20190925.1509/clomacs-autoloads.el b/elpa/clomacs-20191201.200/clomacs-autoloads.el similarity index 87% rename from elpa/clomacs-20190925.1509/clomacs-autoloads.el rename to elpa/clomacs-20191201.200/clomacs-autoloads.el index 5ec2e03c..f13f0f6c 100644 --- a/elpa/clomacs-20190925.1509/clomacs-autoloads.el +++ b/elpa/clomacs-20191201.200/clomacs-autoloads.el @@ -1,9 +1,12 @@ ;;; clomacs-autoloads.el --- automatically extracted autoloads ;; ;;; Code: -(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + -;;;### (autoloads nil "clomacs" "clomacs.el" (23994 46781 58246 126000)) +;;;### (autoloads nil "clomacs" "clomacs.el" (0 0 0 0)) ;;; Generated autoloads from clomacs.el (autoload 'clomacs-def "clomacs" "\ @@ -37,11 +40,14 @@ evaluation can be added and executed. \(fn EL-FUNC-NAME CL-FUNC-NAME &key (CALL-TYPE :sync) (CALLBACK nil) (DOC nil) (INTERACTIVE nil) (RETURN-TYPE :string) (RETURN-VALUE :value) LIB-NAME NAMESPACE (HTTPD-STARTER nil) NREPL-READY-CALLBACK (BACKEND :clj))" nil t) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "clomacs" '("clo" "execute"))) + ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t +;; coding: utf-8 ;; End: ;;; clomacs-autoloads.el ends here diff --git a/elpa/clomacs-20191201.200/clomacs-pkg.el b/elpa/clomacs-20191201.200/clomacs-pkg.el new file mode 100644 index 00000000..708ce383 --- /dev/null +++ b/elpa/clomacs-20191201.200/clomacs-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "clomacs" "20191201.200" "Simplifies Emacs Lisp interaction with Clojure." '((emacs "24.3") (cider "0.22.1") (s "1.12.0") (simple-httpd "1.4.6")) :commit "88b8fc6d1b7105adae009578ef24fedaf157f341" :keywords '("clojure" "interaction") :authors '(("Kostafey" . "kostafey@gmail.com")) :maintainer '("Kostafey" . "kostafey@gmail.com") :url "https://github.com/clojure-emacs/clomacs") diff --git a/elpa/clomacs-20190925.1509/clomacs.el b/elpa/clomacs-20191201.200/clomacs.el similarity index 99% rename from elpa/clomacs-20190925.1509/clomacs.el rename to elpa/clomacs-20191201.200/clomacs.el index 649e6ac5..5c0d309c 100644 --- a/elpa/clomacs-20190925.1509/clomacs.el +++ b/elpa/clomacs-20191201.200/clomacs.el @@ -4,7 +4,7 @@ ;; Author: Kostafey ;; URL: https://github.com/clojure-emacs/clomacs -;; Package-Version: 20190925.1509 +;; Package-Version: 20191201.200 ;; Keywords: clojure, interaction ;; Version: 0.0.4 ;; Package-Requires: ((emacs "24.3") (cider "0.22.1") (s "1.12.0") (simple-httpd "1.4.6")) @@ -92,7 +92,8 @@ If LIBRARY is nil, attempts to use \"clomacs\", \"localhost\" or any current connection. If can't find any nREPL process return nil." (if library - (clomacs-search-connection library) + (or (clomacs-search-connection library) + (if noninteractive (cider-current-repl))) (or (clomacs-search-connection "clomacs") (clomacs-search-connection "localhost") (cider-current-repl)))) diff --git a/elpa/clomacs-readme.txt b/elpa/clomacs-readme.txt new file mode 100644 index 00000000..42f12db3 --- /dev/null +++ b/elpa/clomacs-readme.txt @@ -0,0 +1,7 @@ +`clomacs-defun' - core Clojure to Elisp function wrapper. + +Elisp to Clojure calls helper functions: +`clomacs-create-httpd-start' - package-specific httpd connection setup. +`clomacs-create-httpd-stop' - package-specific httpd connection stop. + +See README.md for detailed description. -- 2.47.3