emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace doom--version-list-str with package-version-join

Browse source
This commit is contained in:
Henrik Lissner 2017-04-04 13:16:11 -04:00
parent 30044533a3
commit 87a93b1d82
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/autoload/packages.el
View file

@ -131,11 +131,6 @@ Used by `doom/packages-install'."
(delete-directory path t))))) (delete-directory path t)))))
;;; Private functions ;;; Private functions
(defsubst doom--version-list-str (vlist)
(concat (number-to-string (car vlist))
"."
(number-to-string (cadr vlist))))
(defsubst doom--sort-alpha (it other) (defsubst doom--sort-alpha (it other)
(string-lessp (symbol-name (car it)) (string-lessp (symbol-name (car it))
(symbol-name (car other)))) (symbol-name (car other))))
@ -265,8 +260,8 @@ appropriate."
(lambda (pkg) (lambda (pkg)
(format "+ %s %s -> %s" (format "+ %s %s -> %s"
(s-pad-right (+ max-len 2) " " (symbol-name (car pkg))) (s-pad-right (+ max-len 2) " " (symbol-name (car pkg)))
(s-pad-right 14 " " (doom--version-list-str (cadr pkg))) (s-pad-right 14 " " (package-version-join (cadr pkg)))
(doom--version-list-str (cl-caddr pkg)))) (package-version-join (cl-caddr pkg))))
packages packages
"\n")))))) "\n"))))))
(message "Aborted!")) (message "Aborted!"))
@ -358,8 +353,8 @@ calls."
(if-let (desc (doom-package-outdated-p (intern package))) (if-let (desc (doom-package-outdated-p (intern package)))
(if (y-or-n-p (format "%s will be updated from %s to %s. Update?" (if (y-or-n-p (format "%s will be updated from %s to %s. Update?"
(car desc) (car desc)
(doom--version-list-str (cadr desc)) (package-version-join (cadr desc))
(doom--version-list-str (cl-caddr desc)))) (package-version-join (cl-caddr desc))))
(message "%s %s" (message "%s %s"
(if (doom-update-package package) (if (doom-update-package package)
"Updated" "Updated"