refactor: ordering

Author: jcs090218

lisp/_prepare.el

@@ -1434,25 +1434,10 @@ This uses function `locate-dominating-file' to look up directory tree."
                  (eask-with-verbosity 'debug (eask--load-config))
                  (eask--with-hooks ,@body))))))
          ;; Report exit stats if any.
-         (eask--handle-exit-status)))))
+         (eask--resolve-exit-status)))))
 
-(defun eask--error-status ()
-  "Return error status."
-  (let ((result))
-    ;; Error.
-    (when eask--has-error-p
-      (push 'error result))
-    ;; Warning.
-    (when eask--has-warn-p
-      (push (if (eask-strict-p)
-                'error
-              'warn)
-            result))
-    ;; No repeat.
-    (delete-dups result)))
-
-(defun eask--handle-exit-status ()
-  "Return non-nil if we should report error for exit status."
+(defun eask--resolve-exit-status ()
+  "Resolve current exit status."
   (when (memq 'error (eask--error-status))
     (eask--exit 'failure)))
 
@@ -2010,8 +1995,30 @@ Argument ARGS are direct arguments for functions `eask-error' or `eask-warn'."
   (declare (indent 0) (debug t))
   `(eask-ignore-errors (eask--silent-error ,@body)))
 
+(defun eask--error-status ()
+  "Return error status."
+  (let ((result))
+    ;; Error.
+    (when eask--has-error-p
+      (push 'error result))
+    ;; Warning.
+    (when eask--has-warn-p
+      (push (if (eask-strict-p)
+                'error
+              'warn)
+            result))
+    ;; No repeat.
+    (delete-dups result)))
+
 (defun eask--trigger-error ()
   "Trigger error event."
+  (cond ((< emacs-major-version 28)
+         ;; Handle https://github.com/emacs-eask/cli/issues/11.
+         (unless (string-prefix-p "Can't find library " (car args))
+           (setq eask--has-error-p t)))
+        (t
+         (setq eask--has-error-p t)))  ; Just a record.
+
   (when (and (not eask--ignore-error-p)
              (not (eask-allow-error-p))
              ;; Ignore when checking Eask-file.
@@ -2023,29 +2030,26 @@ Argument ARGS are direct arguments for functions `eask-error' or `eask-warn'."
   "On error.
 
 Arguments FNC and ARGS are used for advice `:around'."
-  ;; Handle https://github.com/emacs-eask/cli/issues/11.
-  (cond ((< emacs-major-version 28)
-         (unless (string-prefix-p "Can't find library " (car args))
-           (setq eask--has-error-p t)))
-        (t
-         ;; Just a record.
-         (setq eask--has-error-p t)))
   (let ((msg (eask--ansi 'error (apply #'format-message args))))
     (unless eask-inhibit-error-message
       (eask--unsilent (eask-msg "%s" msg)))
     (run-hook-with-args 'eask-on-error-hook 'error msg)
     (eask--trigger-error))
   (when debug-on-error (apply fnc args)))
 
+(defun eask--trigger-warn ()
+  "Trigger warning event."
+  (setq eask--has-warn-p t))  ; Just a record.
+
 (defun eask--warn (fnc &rest args)
   "On warn.
 
 Arguments FNC and ARGS are used for advice `:around'."
-  (setq eask--has-warn-p t)  ; Just a record.
   (let ((msg (eask--ansi 'warn (apply #'format-message args))))
     (unless eask-inhibit-error-message
       (eask--unsilent (eask-msg "%s" msg)))
-    (run-hook-with-args 'eask-on-warning-hook 'warn msg))
+    (run-hook-with-args 'eask-on-warning-hook 'warn msg)
+    (eask--trigger-warn))
   (eask--silent (apply fnc args)))
 
 ;; Don't pollute outer exection.