branch: elpa/cider
commit ac86c55597ba2449c9f753a6fce4f096f0c92ec3
Author: Bozhidar Batsov <bozhi...@batsov.dev>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
Remove wrapper around package-get-version
It's no longer needed now that we target Emacs 27.
---
cider-util.el | 10 +---------
test/cider-util-tests.el | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/cider-util.el b/cider-util.el
index 779c64be70..6e752918b2 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -429,19 +429,11 @@ propertized (defaults to current buffer)."
(defvar cider-version)
(defvar cider-codename)
-(defun cider--pkg-version ()
- "Extract CIDER's package version from its package metadata."
- ;; Use `cond' below to avoid a compiler unused return value warning
- ;; when `package-get-version' returns nil. See #3181.
- ;; FIXME: Inline the logic from package-get-version and adapt it
- (cond ((fboundp 'package-get-version)
- (package-get-version))))
-
(defun cider--version ()
"Retrieve CIDER's version.
A codename is added to stable versions."
(if (string-match-p "-snapshot" cider-version)
- (let ((pkg-version (cider--pkg-version)))
+ (let ((pkg-version (package-get-version)))
(if pkg-version
;; snapshot versions include the MELPA package version
(format "%s (package: %s)" cider-version pkg-version)
diff --git a/test/cider-util-tests.el b/test/cider-util-tests.el
index 656e7f2dbb..fcff3f0e2b 100644
--- a/test/cider-util-tests.el
+++ b/test/cider-util-tests.el
@@ -64,7 +64,7 @@ buffer."
(it "handles snapshot versions"
(setq cider-version "0.11.0-snapshot"
cider-codename "Victory")
- (spy-on 'cider--pkg-version :and-return-value "20160301.2217")
+ (spy-on 'package-get-version :and-return-value "20160301.2217")
(expect (cider--version) :to-equal "0.11.0-snapshot (package:
20160301.2217)")))
(defvar some-cider-hook)
