Skip to content

Commit 91b4965

Browse files
committed
fix(lisp): Use progress for skipping operations
1 parent 15c48eb commit 91b4965

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

lisp/_prepare.el

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ for more information."
441441
(if (< elapsed eask-minimum-reported-time)
442442
(ignore-errors (eask-msg ,msg-end))
443443
(ignore-errors (eask-write ,msg-end))
444-
(eask-msg (format " (%.3fs)" elapsed)))))
444+
(eask-msg " (%.3fs)" elapsed))))
445445
(ignore-errors (eask-write ,msg-start)) ,body
446446
(ignore-errors (eask-msg ,msg-end))))
447447

@@ -793,9 +793,10 @@ The optional argument URL-OR-PACKAGE is used in the function `try'."
793793
(eask--pkg-process pkg
794794
(cond
795795
((and installed-p (not should-reinstall-p))
796-
(eask-msg " - %sSkipping %s (%s)... already installed ✗"
797-
eask--action-prefix
798-
name version))
796+
(eask-with-progress
797+
(format " - %sSkipping %s (%s)... " eask--action-prefix name version)
798+
(progn ) ; no operation needed
799+
"already installed ✗"))
799800
(t
800801
(eask-with-progress
801802
(format " - %s%snstalling %s (%s)... " eask--action-prefix
@@ -814,9 +815,10 @@ The optional argument URL-OR-PACKAGE is used in the function `try'."
814815
(eask--pkg-process pkg
815816
(cond
816817
((and installed-p (not should-reinstall-p))
817-
(eask-msg " - %sSkipping %s (%s)... already installed ✗"
818-
eask--action-prefix
819-
name version))
818+
(eask-with-progress
819+
(format " - %sSkipping %s (%s)... " eask--action-prefix name version)
820+
(progn ) ; no operation needed
821+
"already installed ✗"))
820822
(t
821823
(eask-with-progress
822824
(format " - %s%snstalling %s (%s)... " eask--action-prefix
@@ -842,9 +844,10 @@ The optional argument URL-OR-PACKAGE is used in the function `try'."
842844
(eask--pkg-process pkg
843845
(cond
844846
((and installed-p (not should-reinstall-p))
845-
(eask-msg " - %sSkipping %s (%s)... already installed ✗"
846-
eask--action-prefix
847-
name version))
847+
(eask-with-progress
848+
(format " - %sSkipping %s (%s)... " eask--action-prefix name version)
849+
(progn ) ; no operation needed
850+
"already installed ✗"))
848851
((progn
849852
(eask-pkg-init)
850853
(unless (eask-package-installable-p pkg)
@@ -875,7 +878,10 @@ The optional argument URL-OR-PACKAGE is used in the function `try'."
875878
(eask--pkg-process pkg
876879
(cond
877880
((not installed-p)
878-
(eask-msg " - %sSkipping %s (%s)... not installed ✗" eask--action-prefix name version))
881+
(eask-with-progress
882+
(format " - %sSkipping %s (%s)... " eask--action-prefix name version)
883+
(progn ) ; no operation needed
884+
"not installed ✗"))
879885
(t
880886
(eask--pkg-process pkg ; Second call to force refresh the data.
881887
(eask-with-progress
@@ -891,7 +897,10 @@ The optional argument URL-OR-PACKAGE is used in the function `try'."
891897
(cond
892898
;; You cannot reinstall the package that are not installed.
893899
((not installed-p)
894-
(eask-msg " - %sSkipping %s (%s)... not installed ✗" eask--action-prefix name version))
900+
(eask-with-progress
901+
(format " - %sSkipping %s (%s)... " eask--action-prefix name version)
902+
(progn ) ; no operation needed
903+
"not installed ✗"))
895904
(t
896905
(eask-pkg-init)
897906
(eask--pkg-process pkg ; Second call to force refresh the data.

0 commit comments

Comments
 (0)