From c04fb31863102dc7115bcf3ae58ecfdcdb77decf Mon Sep 17 00:00:00 2001 From: Filipp Gunbin Date: Tue, 31 May 2016 23:20:03 +0300 Subject: [PATCH] packages/javaimp: Fix comparison of module load ts with parent files. --- packages/javaimp/javaimp.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el index 52abbaa29..c2798a73d 100644 --- a/packages/javaimp/javaimp.el +++ b/packages/javaimp/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))))) -- 2.39.2