emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/javaimp c59e1f7 22/32: packages/javaimp: Fix comparison


From: Stefan Monnier
Subject: [elpa] externals/javaimp c59e1f7 22/32: packages/javaimp: Fix comparison of module load ts with parent files.
Date: Tue, 1 Dec 2020 10:08:30 -0500 (EST)

branch: externals/javaimp
commit c59e1f726ce29c51c4318973dbb52b1e89c5d196
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>

    packages/javaimp: Fix comparison of module load ts with parent files.
---
 javaimp.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/javaimp.el b/javaimp.el
index 52abbaa..c2798a7 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -420,25 +420,25 @@ the temporary buffer and returns its result"
 ;;; Loading dep-jars
 
 (defun javaimp--maven-update-module-maybe (node)
-  (let (need-update)
-    (let ((module (javaimp-node-contents node)))
-      (or (javaimp-module-dep-jars module)
-         (progn (message "Loading dependencies: %s" (javaimp-module-id module))
-                (setq need-update t))))
-    ;; check if any pom up to the top has changed
+  (let ((module (javaimp-node-contents node))
+       need-update)
+    ;; check if deps are initialized
+    (or (javaimp-module-dep-jars module)
+       (progn (message "Loading dependencies: %s" (javaimp-module-id module))
+              (setq need-update t)))
+    ;; check if any pom up to the top one has changed
     (let ((tmp node))
       (while (and tmp
                  (not need-update))
-       (let ((module (javaimp-node-contents tmp)))
-         (if (> (float-time (javaimp--get-file-ts (javaimp-module-file 
module)))
+       (let ((checked (javaimp-node-contents tmp)))
+         (if (> (float-time (javaimp--get-file-ts (javaimp-module-file 
checked)))
                 (float-time (javaimp-module-load-ts module)))
              (progn
-               (message "Reloading (%s pom changed)" (javaimp-module-id 
module))
+               (message "Reloading %s (pom changed)" (javaimp-module-id 
checked))
                (setq need-update t))))
        (setq tmp (javaimp-node-parent tmp))))
     (when need-update
-      (let* ((module (javaimp-node-contents node))
-            (new-dep-jars (javaimp--maven-fetch-dep-jars module))
+      (let* ((new-dep-jars (javaimp--maven-fetch-dep-jars module))
             (new-load-ts (current-time)))
        (setf (javaimp-module-dep-jars module) new-dep-jars)
        (setf (javaimp-module-load-ts module) new-load-ts)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]