[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 3a57d2e: * packages/javaimp/javaimp.el (javaimp): Add a pa
From: |
Stefan Monnier |
Subject: |
[elpa] master 3a57d2e: * packages/javaimp/javaimp.el (javaimp): Add a parent group |
Date: |
Fri, 22 Apr 2016 04:45:39 +0000 |
branch: master
commit 3a57d2e04d1148386210166212892af4764e0e20
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* packages/javaimp/javaimp.el (javaimp): Add a parent group
(javaimp--maven-xml-load-tree): Fix reference to free var `project-elt`.
(javaimp-organize-imports): Use cl-lib name.
---
packages/javaimp/javaimp.el | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el
index 7cd1e3e..a14d3da 100644
--- a/packages/javaimp/javaimp.el
+++ b/packages/javaimp/javaimp.el
@@ -78,7 +78,8 @@
;; User options
(defgroup javaimp ()
- "Add and reorder Java import statements in Maven projects")
+ "Add and reorder Java import statements in Maven projects"
+ :group 'c)
(defcustom javaimp-import-group-alist '(("\\`javax?\\." . 10))
"Specifies how to group classes and how to order resulting
@@ -260,9 +261,10 @@ children and are also included. Subordinate modules with
no
inheritance are not included."
(let ((xml-tree (javaimp--maven-xml-read-effective-pom file)))
(cond ((assq 'project xml-tree)
- (let ((project-elt (assq 'project xml-tree))
- (submodules (javaimp--xml-children
- (javaimp--xml-child 'modules project-elt)
'module)))
+ (let* ((project-elt (assq 'project xml-tree))
+ (submodules (javaimp--xml-children
+ (javaimp--xml-child 'modules project-elt)
+ 'module)))
(and submodules
;; no real children
(message "Independent submodules: %s"
@@ -680,9 +682,10 @@ is `'ordinary' or `'static'. Interactively, NEW-IMPORTS
is nil."
(delete-region first (point))))
(javaimp--prepare-for-insertion first)
(setq all-imports
- (delete-duplicates all-imports
- :test (lambda (first second)
- (equal (car first) (car second)))))
+ (cl-delete-duplicates
+ all-imports
+ :test (lambda (first second)
+ (equal (car first) (car second)))))
;; assign order
(let ((with-order
(mapcar
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master 3a57d2e: * packages/javaimp/javaimp.el (javaimp): Add a parent group,
Stefan Monnier <=