File tree 2 files changed +2
-10
lines changed
2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -429,19 +429,11 @@ propertized (defaults to current buffer)."
429
429
(defvar cider-version )
430
430
(defvar cider-codename )
431
431
432
- (defun cider--pkg-version ()
433
- " Extract CIDER's package version from its package metadata."
434
- ; ; Use `cond' below to avoid a compiler unused return value warning
435
- ; ; when `package-get-version' returns nil. See #3181.
436
- ; ; FIXME: Inline the logic from package-get-version and adapt it
437
- (cond ((fboundp 'package-get-version )
438
- (package-get-version))))
439
-
440
432
(defun cider--version ()
441
433
" Retrieve CIDER's version.
442
434
A codename is added to stable versions."
443
435
(if (string-match-p " -snapshot" cider-version)
444
- (let ((pkg-version (cider--pkg -version)))
436
+ (let ((pkg-version (package-get -version)))
445
437
(if pkg-version
446
438
; ; snapshot versions include the MELPA package version
447
439
(format " %s (package: %s )" cider-version pkg-version)
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ buffer."
64
64
(it " handles snapshot versions"
65
65
(setq cider-version " 0.11.0-snapshot"
66
66
cider-codename " Victory" )
67
- (spy-on 'cider--pkg -version :and-return-value " 20160301.2217" )
67
+ (spy-on 'package-get -version :and-return-value " 20160301.2217" )
68
68
(expect (cider--version) :to-equal " 0.11.0-snapshot (package: 20160301.2217)" )))
69
69
70
70
(defvar some-cider-hook )
You can’t perform that action at this time.
0 commit comments