X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/24ce066b6a6a195cdb06bbf87b92df502718806f..f10533854f4c7bb54247a11981191bf37b70cb36:/packages/javaimp/javaimp.el diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el index 52abbaa29..d1c68657d 100644 --- a/packages/javaimp/javaimp.el +++ b/packages/javaimp/javaimp.el @@ -85,8 +85,8 @@ "Specifies how to group classes and how to order resulting groups in the imports list. -Each element should be of the form `(CLASSNAME-REGEXP . ORDER)' -where `CLASSNAME-REGEXP' is a regexp matching the fully qualified +Each element should be of the form (CLASSNAME-REGEXP . ORDER) +where CLASSNAME-REGEXP is a regexp matching the fully qualified class name. Lowest-order groups are placed earlier. The order of classes which were not matched is defined by @@ -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))))) @@ -646,7 +646,7 @@ are assigned a default order defined by NEW-IMPORTS is a list of additional imports; each element should be of the form (CLASS . TYPE), where CLASS is a string and TYPE -is `'ordinary' or `'static'. Interactively, NEW-IMPORTS is nil." +is `ordinary' or `static'. Interactively, NEW-IMPORTS is nil." (interactive) (barf-if-buffer-read-only) (save-excursion