aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/java.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet/srecode/java.el')
-rw-r--r--lisp/cedet/srecode/java.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index f6cd3f893da..1b1c184fe87 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -40,16 +40,15 @@ FILENAME_AS_CLASS - file converted to a Java class name."
40 (fnox (file-name-sans-extension fsym)) 40 (fnox (file-name-sans-extension fsym))
41 (dir (file-name-directory (buffer-file-name))) 41 (dir (file-name-directory (buffer-file-name)))
42 (fpak fsym) 42 (fpak fsym)
43 (proj (ede-current-project))
44 (pths (ede-source-paths proj 'java-mode))
43 ) 45 )
44 (while (string-match "\\.\\| " fpak) 46 (while (string-match "\\.\\| " fpak)
45 (setq fpak (replace-match "_" t t fpak))) 47 (setq fpak (replace-match "_" t t fpak)))
46 ;; We can extract package from: 48 ;; We can extract package from:
47 ;; 1) a java EDE project source paths, 49 ;; 1) a java EDE project source paths,
48 (cond ((ede-current-project) 50 (cond ((and proj pths)
49 (let* ((proj (ede-current-project)) 51 (let* ((pth) (res))
50 (pths (ede-source-paths proj 'java-mode))
51 (pth)
52 (res))
53 (while (and (not res) 52 (while (and (not res)
54 (setq pth (expand-file-name (car pths)))) 53 (setq pth (expand-file-name (car pths))))
55 (when (string-match pth dir) 54 (when (string-match pth dir)