Skip to content

Commit 7de63df

Browse files
committed
Small fixes to make NonGNU ELPA happier
Thanks @monnier!
1 parent 67b0403 commit 7de63df

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ TAGS
1010
dist
1111
.vagrant/
1212
.dir-locals?.el
13+
14+
# ELPA-generated files
15+
/inf-clojure-autoloads.el
16+
/inf-clojure-pkg.el

inf-clojure.el

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
;; Authors: Bozhidar Batsov <bozhidar@batsov.dev>
66
;; Olin Shivers <shivers@cs.cmu.edu>
7+
;; Maintainer: Bozhidar Batsov <bozhidar@batsov.dev>
78
;; URL: http://github.com/clojure-emacs/inf-clojure
89
;; Keywords: processes, comint, clojure
910
;; Version: 3.2.0
@@ -212,8 +213,8 @@ If no-error is truthy don't error if feature is not present."
212213

213214
(defun inf-clojure--update-feature (repl-type feature form)
214215
"Return a copy of the datastructure containing the repl features.
215-
Given a REPL-TYPE ('clojure, 'lumo, ...) and a FEATURE ('doc,
216-
'apropos, ...) and a FORM this will return a new datastructure
216+
Given a REPL-TYPE (`clojure', `lumo', ...) and a FEATURE (`doc',
217+
`apropos', ...) and a FORM this will return a new datastructure
217218
that can be set as `inf-clojure-repl-features'."
218219
(let ((original (alist-get repl-type inf-clojure-repl-features)))
219220
(if original
@@ -225,8 +226,8 @@ that can be set as `inf-clojure-repl-features'."
225226

226227
(defun inf-clojure-update-feature (repl-type feature form)
227228
"Mutate the repl features to the new FORM.
228-
Given a REPL-TYPE ('clojure, 'lumo, ...) and a FEATURE ('doc,
229-
'apropos, ...) and a FORM this will set
229+
Given a REPL-TYPE (`clojure', `lumo', ...) and a FEATURE (`doc',
230+
`apropos', ...) and a FORM this will set
230231
`inf-clojure-repl-features' with these new values."
231232
(setq inf-clojure-repl-features (inf-clojure--update-feature repl-type feature form)))
232233

@@ -352,7 +353,7 @@ Either \"no process\" or \"buffer-name(repl-type)\""
352353
map))
353354

354355
(defvar inf-clojure-insert-commands-map
355-
(let ((map (define-prefix-command 'inf-clojure-insert-commands-map)))
356+
(let ((map (make-sparse-keymap)))
356357
(define-key map (kbd "d") #'inf-clojure-insert-defun)
357358
(define-key map (kbd "C-d") #'inf-clojure-insert-defun)
358359
(define-key map (kbd "e") #'inf-clojure-insert-last-sexp)
@@ -369,7 +370,7 @@ Either \"no process\" or \"buffer-name(repl-type)\""
369370
(define-key map (kbd "C-c C-r") #'inf-clojure-eval-region)
370371
(define-key map (kbd "C-c M-r") #'inf-clojure-reload)
371372
(define-key map (kbd "C-c C-n") #'inf-clojure-eval-form-and-next)
372-
(define-key map (kbd "C-c C-j") 'inf-clojure-insert-commands-map)
373+
(define-key map (kbd "C-c C-j") inf-clojure-insert-commands-map)
373374
(define-key map (kbd "C-c C-z") #'inf-clojure-switch-to-repl)
374375
(define-key map (kbd "C-c C-i") #'inf-clojure-show-ns-vars)
375376
(define-key map (kbd "C-c C-S-a") #'inf-clojure-apropos)
@@ -430,7 +431,7 @@ displaying function signatures in the modeline, but can also
430431
cause multiple prompts to appear in the REPL and mess with *1,
431432
*2, etc."
432433
:type 'boolean
433-
:safe 'booleanp
434+
:safe #'booleanp
434435
:package-version '(inf-clojure . "3.2.0"))
435436

436437
;;;###autoload
@@ -926,10 +927,10 @@ Indent FORM. FORM is expected to have been trimmed."
926927
(buffer-substring-no-properties (save-excursion (backward-sexp) (point))
927928
(point))))
928929

929-
;;; Now that inf-clojure-eval-/defun/region takes an optional prefix arg,
930-
;;; these commands are redundant. But they are kept around for the user
931-
;;; to bind if he wishes, for backwards functionality, and because it's
932-
;;; easier to type C-c e than C-u C-c C-e.
930+
;; Now that inf-clojure-eval-/defun/region takes an optional prefix arg,
931+
;; these commands are redundant. But they are kept around for the user
932+
;; to bind if he wishes, for backwards functionality, and because it's
933+
;; easier to type C-c e than C-u C-c C-e.
933934

934935
(defun inf-clojure-eval-region-and-go (start end)
935936
"Send the current region to the inferior Clojure, and switch to its buffer.
@@ -1017,7 +1018,7 @@ display."
10171018
(if (zerop (length ans)) default ans))))
10181019

10191020

1020-
;;; Adapted from function-called-at-point in help.el.
1021+
;; Adapted from function-called-at-point in help.el.
10211022
(defun inf-clojure-fn-called-at-pt ()
10221023
"Return the name of the function called in the current call.
10231024
The value is nil if it can't find one."

0 commit comments

Comments
 (0)