branch: elpa/cider
commit a2201eeb8392f77d7d097d9f2a46a34d21858297
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Replace cl-labels with cl-flet where possible
All four usages of cl-labels in the codebase define a single
non-recursive local function, so cl-flet is the simpler and
more appropriate choice.
---
lisp/cider-browse-ns.el | 2 +-
lisp/cider-eval.el | 2 +-
lisp/cider-mode.el | 2 +-
lisp/cider-repl.el | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/cider-browse-ns.el b/lisp/cider-browse-ns.el
index 7e71b40f1a0..c9a4dfd998e 100644
--- a/lisp/cider-browse-ns.el
+++ b/lisp/cider-browse-ns.el
@@ -268,7 +268,7 @@ list of items."
(defun cider-browse-ns--render-items (items)
"Render the nrepl-dict ITEMS to the browse-ns buffer."
(let* ((max-length (cider-browse-ns--column-width items)))
- (cl-labels
+ (cl-flet
((keys-from-pred
(pred items)
(nrepl-dict-keys (nrepl-dict-filter (lambda (_ var-meta)
diff --git a/lisp/cider-eval.el b/lisp/cider-eval.el
index 01a6e4f030f..1891a3efb66 100644
--- a/lisp/cider-eval.el
+++ b/lisp/cider-eval.el
@@ -221,7 +221,7 @@ Returns the position at which PROPERTY was found, or nil if
not found."
_ARG and _RESET are ignored, as there is only ever one compilation error.
They exist for compatibility with `next-error'."
(interactive)
- (cl-labels ((goto-next-note-boundary
+ (cl-flet ((goto-next-note-boundary
()
(let ((p (or (cider-find-property 'cider-note-p)
(cider-find-property 'cider-note-p t))))
diff --git a/lisp/cider-mode.el b/lisp/cider-mode.el
index f75113a0b26..7576f901780 100644
--- a/lisp/cider-mode.el
+++ b/lisp/cider-mode.el
@@ -790,7 +790,7 @@ with the given LIMIT."
cider-font-lock-dynamically))
deprecated enlightened
macros functions vars instrumented traced)
- (cl-labels ((handle-plist
+ (cl-flet ((handle-plist
(plist)
;; Note that (memq 'function cider-font-lock-dynamically) and
similar statements are evaluated differently
;; for `core' - they're always truthy for `core' (see related
core-handling code some lines below):
diff --git a/lisp/cider-repl.el b/lisp/cider-repl.el
index 4dca75647a3..587efd34158 100644
--- a/lisp/cider-repl.el
+++ b/lisp/cider-repl.el
@@ -335,7 +335,7 @@ fully initialized."
PARAM-TUPLES are tuples of (param-key description) or (param-key
description transform) where transform is called with the param-value if
present."
- (cl-labels
+ (cl-flet
((emit-comment
(contents)
(insert-before-markers
